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

Update vendor libraries #4302

Merged
merged 5 commits into from
Jun 1, 2020
Merged

Update vendor libraries #4302

merged 5 commits into from
Jun 1, 2020

Conversation

frostming
Copy link
Contributor

@frostming frostming commented Jun 1, 2020

Thank you for contributing to Pipenv!

The issue

The fix

  • Update requirements 1.5.9->1.5.10
  • Update pythonfinder 1.2.2->1.2.4

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 #.

Copy link
Member

@techalchemy techalchemy left a comment

Choose a reason for hiding this comment

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

one thing is we still need the pep514tools license from pythonfinder, i'll re-add that real quick

@@ -1,21 +0,0 @@
MIT License
Copy link
Member

Choose a reason for hiding this comment

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

We still need this one!

@@ -422,7 +422,7 @@ def expand_paths(path, only_python=True):
isinstance(path, Sequence)
and not getattr(path.__class__, "__name__", "") == "PathEntry"
):
for p in unnest(path):
for p in path:
Copy link
Member

Choose a reason for hiding this comment

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

Was this from the last release? I think I forgot to update pythonfinder!

):
yield dir_entry
dirs_to_search = [path]
while dirs_to_search:
Copy link
Member

Choose a reason for hiding this comment

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

glad to get this merged, so much nesting though!

attrs==19.3.0
distlib==0.3.0
packaging==20.3
pyparsing==2.4.7
git+https://github.com/sarugaku/plette.git@master#egg=plette
Copy link
Member

Choose a reason for hiding this comment

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

Is the release in sync with master now? that's nice to know anyhow

@@ -0,0 +1,78 @@
diff --git a/pipenv/vendor/pythonfinder/compat.py b/pipenv/vendor/pythonfinder/compat.py
Copy link
Member

Choose a reason for hiding this comment

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

sorry again for the patches. For most of these they really should be caught by the vendoring import rewrites but for some reason they arent

Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
Copy link
Member

@techalchemy techalchemy left a comment

Choose a reason for hiding this comment

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

ok all set! thanks for taking care of this

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment