close
Skip to content

Prefer public packaging module to pkg_resources' private copy of it #826

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.

Sign up for GitHub

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

Merged
waylan merged 2 commits into from
May 16, 2019
Merged

Prefer public packaging module to pkg_resources' private copy of it #826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5cc1573
Prefer public packaging module to pkg_resources' private copy of it
mitya57 May 16, 2019
df8b7c5
Improve release notes comment.
waylan May 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions docs/change_log/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ _______, 2019: Released version 3.1.1 (a bug-fix release).

* Fixed import failure in `setup.py` when the source directory is not
on `sys.path` (#823).
* Prefer public `packaging` module to pkg_resources' private copy of
it (#825).

Mar 25, 2019: Released version 3.1 ([Notes](release-3.1.md)).

Expand Down
5 changes: 4 additions & 1 deletion markdown/__meta__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@
License: BSD (see LICENSE.md for details).
"""

from pkg_resources.extern import packaging
try:
import packaging.version
except ImportError:
from pkg_resources.extern import packaging

# __version_info__ format:
# (major, minor, patch, dev/alpha/beta/rc/final, #)
Expand Down