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

feat(install): unify setup.py, requirements.in, pip #1537

Conversation

tildebyte
Copy link
Contributor

@tildebyte tildebyte commented Nov 22, 2022

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'

ALso tweaked some logging and formatting here and there

Signed-off-by: Ben Alkov ben.alkov@gmail.com

@tildebyte tildebyte self-assigned this Nov 22, 2022
@tildebyte tildebyte force-pushed the feat-install-unify-setup-requirements-pip branch 2 times, most recently from a702d0d to da69ba7 Compare November 22, 2022 23:02
@tildebyte
Copy link
Contributor Author

@reviewers: Interesting, important: pypa/setuptools#1983 (comment)

TL;DR - from the setuptools maintainers:

Direct invocations of setup.py install are not the right thing to do, despite the fact that there is a lot of misleading documentation out there indicating that it is.

@tildebyte tildebyte marked this pull request as draft November 22, 2022 23:40
@tildebyte tildebyte force-pushed the feat-install-unify-setup-requirements-pip branch from da69ba7 to d6a0d8e Compare November 22, 2022 23:48
@tildebyte tildebyte marked this pull request as ready for review November 23, 2022 00:54
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 <ben.alkov@gmail.com>
@tildebyte tildebyte force-pushed the feat-install-unify-setup-requirements-pip branch from d6a0d8e to 5a1a36e Compare November 23, 2022 18:34
@lstein
Copy link
Collaborator

lstein commented Nov 24, 2022

Testing now...

@lstein lstein mentioned this pull request Nov 25, 2022
lstein added a commit that referenced this pull request 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.
@lstein lstein merged commit 461358b into invoke-ai:development Nov 25, 2022
@tildebyte tildebyte deleted the feat-install-unify-setup-requirements-pip branch December 3, 2022 21:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants