Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add extras for tests and the usd features to pyproject.toml #221

Merged
merged 5 commits into from
May 31, 2024

Conversation

cadop
Copy link
Contributor

@cadop cadop commented May 22, 2024

Using extras is convenient in setup.py for users, but also allows for specific versioning requirements.

@shi-eric
Copy link
Contributor

Can you stick these into [project.optional-dependencies] of pyproject.toml instead?

@cadop
Copy link
Contributor Author

cadop commented May 23, 2024

I moved to pyproject.toml. I see a dev extra, should that be included in the readme as an optional pip install arg?

@cadop cadop changed the title Add setup.py extras Add extras for tests and the usd features to pyproject.toml May 23, 2024
@shi-eric
Copy link
Contributor

I moved to pyproject.toml. I see a dev extra, should that be included in the readme as an optional pip install arg?

Thanks! I think we will document the [dev] option separately when we more specifically document how other developers outside NVIDIA can contribute to Warp as we've only recently received clarification from legal that our existing license allows for such contributions.

I briefly discussed your PR with @mmacklin last week, and I think it is better if you just add everything under extras, e.g.

extras = ['usd-core', 'matplotlib', 'pyglet']

It seems that having a warp-lang[extras] that only installs usd-core isn't much more convenient than just doing a pip instal usd-core, and the name warp-lang[examples] might be misleading as it is the example dependencies that are installed, not the examples themselves.

Anyway, I want to use your MR to develop a process for getting external contributions back into the Warp codebase, but it might take a few days. As you might have noticed we do our development on an internal repo and then push those changes to GitHub. Eventually we want to migrate development to be GitHub-first, but there are many things that have to happen first before we can do this.

So this PR likely won't be merged directly on GitHub when approved, but someone will probably grab your commits and merge them to our internal repo first, and then close the PR when everything is merged. You should still get credit for the contribution in the commit log. Just giving you a heads up about what's going on behind the scenes!

@cadop
Copy link
Contributor Author

cadop commented May 28, 2024

Updated to just the extras arg.

Thanks for the heads up on the gitlab mirror. Happy to help test future PR processes :)

Copy link

codecov bot commented May 28, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 72.62%. Comparing base (ebcc90d) to head (616e944).

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #221      +/-   ##
==========================================
- Coverage   72.65%   72.62%   -0.03%     
==========================================
  Files          38       38              
  Lines       13867    13867              
==========================================
- Hits        10075    10071       -4     
- Misses       3792     3796       +4     
Flag Coverage Δ
unittests 72.62% <ø> (-0.03%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@shi-eric shi-eric merged commit 2ff2da1 into NVIDIA:main May 31, 2024
11 checks passed
@shi-eric
Copy link
Contributor

shi-eric commented May 31, 2024

Hey @cadop, your PR is now in Warp! https://github.com/NVIDIA/warp/commits?author=cadop

There was a hiccup when doing the merge initially on GitLab. We normally have squash merge turned on, so when all your merges were squashed into a single commit, I became the author. I needed to revert the merge and then merge your changes again, this time turning the squash merge option off. This means that we will have to have the author clean up their PR commit history in the future rather than relying on the system to squash-merge. I've made a note of this.

Please close this PR if you are satisfied with the resolution. Thanks! (Oh wait, it seems that GitHub was smart enough to realize that this PR was merged somewhere else. Cool!!!)

@cadop
Copy link
Contributor Author

cadop commented May 31, 2024

Very cool! Thanks for going through the process.

You could add a github workflow that checks if the PR has 1 commit, and shows a failed test (with author note) if it doesn't just to keep the reminder there. You can always ignore the workflow in cases you want the commit history (e.g. internal devs).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants