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

Fix #4549: Ignore incompatibilities when resolve dist #4593

Merged
merged 4 commits into from
Jan 20, 2021
Merged

Conversation

frostming
Copy link
Contributor

Thank you for contributing to Pipenv!

The issue

What is the thing you want to fix? Is it associated with an issue on GitHub? Please mention it.

Always consider opening an issue first to describe your problem, so we can discuss what is the best way to amend it. Note that if you do not describe the goal of this change or link to a related issue, the maintainers may close the PR without further review.

If your pull request makes a non-insignificant change to Pipenv, such as the user interface or intended functionality, please file a PEEP.

https://github.com/pypa/pipenv/blob/master/peeps/PEEP-000.md

The fix

Close #4549
Close #4476

The checklist

  • Associated issue
  • A news fragment in the news/ directory to describe this fix with the extension .bugfix, .feature, .behavior, .doc. .vendor. or .trivial (this will appear in the release changelog). Use semantic line breaks and name the file after the issue number or the PR #.

@frostming frostming added the Type: Bugfix This issue provides a fix for a known bug. label Jan 20, 2021
@@ -12,7 +12,7 @@

def find_site_path(pkg, site_dir=None):
import pkg_resources
if site_dir is not None:
if site_dir is None:
Copy link
Member

Choose a reason for hiding this comment

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

Eh?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

In fact the site_dir is always given the same value as os.path.dirname(os.path.dirname(os.path.abspath(__file__))), lol

@frostming frostming merged commit 5f91369 into master Jan 20, 2021
@frostming frostming deleted the bugfix/4549 branch January 20, 2021 06:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Type: Bugfix This issue provides a fix for a known bug.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

VersionConflict with importlib-metadata Any package requiring importlib-metadata breaks locking
2 participants