Skip to content

Update vendor packaging in pkg_resources to v19.2#2180

Merged
jaraco merged 2 commits into
pypa:masterfrom
ozars:2175-bump-pkg-resources-vendor
Jul 3, 2020
Merged

Update vendor packaging in pkg_resources to v19.2#2180
jaraco merged 2 commits into
pypa:masterfrom
ozars:2175-bump-pkg-resources-vendor

Conversation

@ozars

@ozars ozars commented Jun 4, 2020

Copy link
Copy Markdown
Contributor

Summary of changes

I bumped the version of vendor packaging of pkg_resources to v19.2 using the script proposed in #2179. I bumped it to v19.2 to keep it consistent with the version of packaging vendored under setuptools, but I can update this vendor to the latest version along with others as well if that's okay?

Closes #2175.

Pull Request Checklist

  • Changes have tests
  • News fragment added in changelog.d. See documentation for details

@jaraco jaraco force-pushed the 2175-bump-pkg-resources-vendor branch from 833517a to d24eb7f Compare July 3, 2020 18:35
@jaraco

jaraco commented Jul 3, 2020

Copy link
Copy Markdown
Member

In c30aca8, I ran pip-run paver -- -m paver update_vendored and it produced a small diff:

diff --git a/pkg_resources/_vendor/packaging/requirements.py b/pkg_resources/_vendor/packaging/requirements.py
index a175b8a2..c3424dcb 100644
--- a/pkg_resources/_vendor/packaging/requirements.py
+++ b/pkg_resources/_vendor/packaging/requirements.py
@@ -70,7 +70,7 @@ URL_AND_MARKER = URL + Optional(MARKER)
 NAMED_REQUIREMENT = NAME + Optional(EXTRAS) + (URL_AND_MARKER | VERSION_AND_MARKER)
 
 REQUIREMENT = stringStart + NAMED_REQUIREMENT + stringEnd
-# pyparsing isn't thread safe during initialization, so we do it eagerly, see
+# pkg_resources.extern.pyparsing isn't thread safe during initialization, so we do it eagerly, see
 # issue #104
 REQUIREMENT.parseString("x[]")

So I used that for consistency. I've also added a changelog entry.

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.

Support for local URLs in install_requires

2 participants