Skip to content

Conversation

@lstein
Copy link
Collaborator

@lstein lstein commented Nov 25, 2022

This is the same as PR #1537 except that it removes a redundant scripts argument from setup.py that appeared at some point.

I also had to unpin the github dependencies in requirements.in in order to get conda CI tests to pass. However, dependencies are still pinned in requirements-base.txt and the environment files, and install itself is working. So I think we are good.

tildebyte and others added 3 commits November 23, 2022 13:34
This allows populating setup.py's 'install_requires' directly from 'requirements.in'

- setup.py:
  - read 'requirements.in' instead of 'requirements.txt'
  - add correct upstream pytorch repo to "dependency_links"
- requirements.in:
  - append "name @" to git packages
  - fix torch repo URL -> 'download.pytorch.org/whl/torch_stable.html'

Signed-off-by: Ben Alkov <[email protected]>
@lstein lstein requested a review from tildebyte as a code owner November 25, 2022 03:07
@lstein
Copy link
Collaborator Author

lstein commented Nov 25, 2022

@tildebyte PR #1537 was failing CI tests because of two script arguments in setup.py. Not sure how this was introduced, but I took your PR, removed the redundant argument, and created a new PR based on it.

1. removed redundant `data_files` argument from setup.py
2. upped requirement to Python >= 3.9. This is due to a feature
   used in `argparse` that is only available in 3.9 or higher.
- conflicts with their counterparts in the environment files was
  causing the CI conda-based tests to fail.
- installer seems to work still
@lstein lstein requested a review from mauwii November 25, 2022 05:29
@lstein
Copy link
Collaborator Author

lstein commented Nov 25, 2022

Seems to be working. Just ran installer on linux system and it worked flawlessly.

@lstein lstein requested review from hipsterusername and removed request for mauwii November 25, 2022 05:31
@lstein lstein changed the title Resolve conflicts in installer Installer final tweaks Nov 25, 2022
@blessedcoolant blessedcoolant self-requested a review November 25, 2022 06:37
@lstein lstein merged commit fdf41cc into development Nov 25, 2022
@lstein lstein deleted the resolve-conflicts-in-installer branch November 25, 2022 16:24
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.

4 participants