Merge pull request #11 from pypa/main

Sync Fork from Upstream Repo
sthagen · Jul 16, 2021 · 2a9dfed · 2a9dfed
2 parents fd02661 + d59efa2
commit 2a9dfed
Show file tree

Hide file tree

Showing 37 changed files with 1,077 additions and 630 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,31 +1,31 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.3.0
+    rev: v3.4.0
     hooks:
       - id: check-toml
       - id: check-yaml
       - id: end-of-file-fixer
       - id: trailing-whitespace
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.790
+    rev: v0.812
     hooks:
       - id: mypy
         exclude: '^(docs|tasks|tests)|setup\.py'
         args: []
 
   - repo: https://github.com/psf/black
-    rev: 19.3b0
+    rev: 20.8b1
     hooks:
       - id: black
 
   - repo: https://github.com/PyCQA/isort
-    rev: 5.6.4
+    rev: 5.8.0
     hooks:
       - id: isort
 
   - repo: https://gitlab.com/PyCQA/flake8
-    rev: "3.7.8"
+    rev: "3.9.0"
     hooks:
       - id: flake8
         additional_dependencies: ["pep8-naming"]

diff --git a/.travis.yml b/.travis.yml
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -4,7 +4,13 @@ Changelog
 *unreleased*
 ~~~~~~~~~~~~
 
+No unreleased changes.
+
+21.0 - 2021-07-03
+~~~~~~~~~~~~~~~~~
+
 * `packaging` is now only compatible with Python 3.6 and above.
+* Add support for zip files in ``parse_sdist_filename`` (:issue:`429`)
 
 20.9 - 2021-01-29
 ~~~~~~~~~~~~~~~~~
@@ -79,7 +85,7 @@ No unreleased changes.
 
 * Use ``sys.implementation.name`` where appropriate for ``packaging.tags`` (:issue:`193`)
 
-* Expand upon the API provded by ``packaging.tags``: ``interpreter_name()``, ``mac_platforms()``, ``compatible_tags()``, ``cpython_tags()``, ``generic_tags()`` (:issue:`187`)
+* Expand upon the API provided by ``packaging.tags``: ``interpreter_name()``, ``mac_platforms()``, ``compatible_tags()``, ``cpython_tags()``, ``generic_tags()`` (:issue:`187`)
 
 * Officially support Python 3.8 (:issue:`232`)
 
@@ -230,7 +236,7 @@ No unreleased changes.
 15.2 - 2015-05-13
 ~~~~~~~~~~~~~~~~~
 
-* Fix an error where the arbitary specifier (``===``) was not correctly
+* Fix an error where the arbitrary specifier (``===``) was not correctly
   allowing pre-releases when it was being used.
 
 * Expose the specifier and version parts through properties on the

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -8,13 +8,16 @@ include mypy.ini
 
 recursive-include docs *
 recursive-include tests *.py
-recursive-include tests hello-world-*
+recursive-include tests/manylinux hello-world-*
+recursive-include tests/musllinux glibc-*
+recursive-include tests/musllinux musl-*
 
 exclude noxfile.py
 exclude .readthedocs.yml
 exclude .travis.yml
 exclude dev-requirements.txt
-exclude tests/build-hello-world.sh
+exclude tests/manylinux/build-hello-world.sh
+exclude tests/musllinux/build.sh
 exclude tests/hello-world.c
 
 prune docs/_build

diff --git a/docs/development/release-process.rst b/docs/development/release-process.rst
@@ -1,7 +1,7 @@
 Release Process
 ===============
 
-#. Checkout the current ``master`` branch.
+#. Checkout the current ``main`` branch.
 #. Install the latest ``nox``::
 
     $ pip install nox
@@ -20,6 +20,6 @@ Release Process
 
    Access needed for making the release are:
 
-   - PyPI maintainer (or owner) access to `packaging`
-   - push directly to the `master` branch on the source repository
+   - PyPI maintainer (or owner) access to ``packaging``
+   - push directly to the ``main`` branch on the source repository
    - push tags directly to the source repository
diff --git a/docs/development/submitting-patches.rst b/docs/development/submitting-patches.rst
@@ -32,13 +32,6 @@ Every code file must start with the boilerplate licensing notice:
     # 2.0, and the BSD License. See the LICENSE file in the root of this repository
     # for complete details.
 
-Additionally, every Python code file must contain
-
-.. code-block:: python
-
-    from __future__ import absolute_import, division, print_function
-
-
 Tests
 -----
 

diff --git a/docs/specifiers.rst b/docs/specifiers.rst
@@ -48,7 +48,7 @@ Usage
 Reference
 ---------
 
-.. class:: SpecifierSet(specifiers, prereleases=None)
+.. class:: SpecifierSet(specifiers="", prereleases=None)
 
     This class abstracts handling specifying the dependencies of a project. It
     can be passed a single specifier (``>=3.0``), a comma-separated list of

diff --git a/noxfile.py b/noxfile.py
@@ -140,7 +140,7 @@ def release(session):
     # Check what files are in dist/ for upload.
     files = sorted(glob.glob("dist/*"))
     expected = [
-        f"dist/{package_name}-{release_version}-py2.py3-none-any.whl",
+        f"dist/{package_name}-{release_version}-py3-none-any.whl",
         f"dist/{package_name}-{release_version}.tar.gz",
     ]
     if files != expected:

diff --git a/packaging/__about__.py b/packaging/__about__.py
@@ -17,7 +17,7 @@
 __summary__ = "Core utilities for Python packages"
 __uri__ = "https://github.com/pypa/packaging"
 
-__version__ = "20.10.dev0"
+__version__ = "21.1.dev0"
 
 __author__ = "Donald Stufft and individual contributors"
 __email__ = "donald@stufft.io"