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

Stop excluding files from package list... #1098

Merged

Conversation

techalchemy
Copy link
Member

Copy link
Member

@nateprewitt nateprewitt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we get a test for the case we're trying to fix here. That will keep it from being regressed later.

if not (is_installable_file(k) or is_installable_file(v) or
any(file_prefix in v for file_prefix in ['path', 'file'])):
ps.update({k: v})
ps.update({k: v})
else:
if not (any(is_vcs(i) for i in [k, v]) or
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We really need a comment expressing what this is doing and why.

else:
if not (any(is_vcs(i) for i in [k, v]) or
any(is_installable_file(i) for i in [k, v]) or
any(is_valid_url(i) for i in [k, v])):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any reasons we're deviating from the use of i in the other checks? They should probably all be entry or i.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I was contemplating swapping everything to entry but I had to re-think all my logic anyway so I just left it as i across the board (which is not very descriptive but uh, sometimes it keeps our lines under 80 characters?)

techalchemy added a commit to techalchemy/pipenv that referenced this pull request Nov 20, 2017
- Will be even more complete with pypa#1098
@techalchemy
Copy link
Member Author

CI is lying, transient failures. Things are fine

@techalchemy
Copy link
Member Author

Btw appveyor passes on my own account:

Build status

You can fix a lot of transient appveyor failures if you add the following to https://ci.appveyor.com/project/kennethreitz/pipenv/settings/build => before build script => cmd:

rmdir /s /q "c:\users\appveyor\appdata\local\temp\1\tmp*\configparser"
rmdir /s /q "c:\users\appveyor\appdata\local\pip-tools\cache"

@nateprewitt nateprewitt closed this Dec 1, 2017
@nateprewitt nateprewitt reopened this Dec 1, 2017
@techalchemy techalchemy force-pushed the bugfix/1079-shallow-editable-installs branch from 9ffe911 to 29e8447 Compare December 1, 2017 18:40
- Fixes pypa#1079 and pypa#909
- Need to exclude non-editable file/path/URI deps from the list we give
to pip-tools
- We should really separate this logic from the logic that supplies what
is supposed to be a list of packages
Add tests and comments to prevent regression
- Ensure we resolve install_requires from local setup.py files
- Squash commits
@techalchemy techalchemy force-pushed the bugfix/1079-shallow-editable-installs branch from 29e8447 to c92e331 Compare December 1, 2017 23:59
- Re-add non-editable setuptools-installable directory paths to the
exclusion list for Project package generation
- This is used to generate package lists for pip-tools
@nateprewitt nateprewitt merged commit d122401 into pypa:master Dec 4, 2017
@techalchemy techalchemy mentioned this pull request Jan 24, 2018
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