Merge branch 'main' into remove-distribution-local

Author: jaraco

.github/workflows/main.yml

@@ -7,13 +7,21 @@ jobs:
     strategy:
       matrix:
         python:
-        - 3.6
+        - 3.7
         - 3.9
-        - 3.10.0-alpha - 3.10.99
-        platform: [ubuntu-latest, macos-latest, windows-latest]
+        - "3.10"
+        platform:
+        - ubuntu-latest
+        - macos-latest
+        - windows-latest
     runs-on: ${{ matrix.platform }}
     steps:
       - uses: actions/checkout@v2
+        with:
+          # fetch all branches and tags (to get tags for versioning)
+          # ref actions/checkout#448
+          fetch-depth: 0
+
       - name: Setup Python
         uses: actions/setup-python@v2
         with:
@@ -52,7 +60,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: "3.10"
       - name: Install tox
         run: |
           python -m pip install tox

CHANGES.rst

@@ -1,5 +1,5 @@
-v4.9.0
-======
+v4.10.0
+=======
 
 * #354: Removed ``Distribution._local`` factory. This
   functionality was created as a demonstration of the
@@ -8,6 +8,25 @@ v4.9.0
   provides this functionality directly through
   `pep517.meta.load <https://github.com/pypa/pep517/blob/a942316305395f8f757f210e2b16f738af73f8b8/pep517/meta.py#L63-L73>`_.
 
+v4.9.0
+======
+
+* Require Python 3.7 or later.
+
+v4.8.3
+======
+
+* #357: Fixed requirement generation from egg-info when a
+  URL requirement is given.
+
+v4.8.2
+======
+
+v2.1.2
+======
+
+* #353: Fixed discovery of distributions when path is empty.
+
 v4.8.1
 ======
 

README.rst

@@ -40,6 +40,8 @@ were contributed to different versions in the standard library:
 
    * - importlib_metadata
      - stdlib
+   * - 4.8
+     - 3.11
    * - 4.4
      - 3.10
    * - 1.4

docs/using.rst

@@ -236,7 +236,7 @@ function::
 Package distributions
 ---------------------
 
-A convience method to resolve the distribution or
+A convenience method to resolve the distribution or
 distributions (in the case of a namespace package) for top-level
 Python packages or modules::
 

importlib_metadata/__init__.py

@@ -684,16 +684,25 @@ def _convert_egg_info_reqs_to_simple_reqs(sections):
         def make_condition(name):
             return name and f'extra == "{name}"'
 
-        def parse_condition(section):
+        def quoted_marker(section):
             section = section or ''
             extra, sep, markers = section.partition(':')
             if extra and markers:
                 markers = f'({markers})'
             conditions = list(filter(None, [markers, make_condition(extra)]))
             return '; ' + ' and '.join(conditions) if conditions else ''
 
+        def url_req_space(req):
+            """
+            PEP 508 requires a space between the url_spec and the quoted_marker.
+            Ref python/importlib_metadata#357.
+            """
+            # '@' is uniquely indicative of a url_req.
+            return ' ' * ('@' in req)
+
         for section in sections:
-            yield section.value + parse_condition(section.name)
+            space = url_req_space(section.value)
+            yield section.value + space + quoted_marker(section.name)
 
 
 class DistributionFinder(MetaPathFinder):
@@ -748,6 +757,9 @@ class FastPath:
     """
     Micro-optimized class for searching a path for
     children.
+
+    >>> FastPath('').children()
+    ['...']
     """
 
     @functools.lru_cache()  # type: ignore
@@ -762,7 +774,7 @@ def joinpath(self, child):
 
     def children(self):
         with suppress(Exception):
-            return os.listdir(self.root or '')
+            return os.listdir(self.root or '.')
         with suppress(Exception):
             return self.zip_children()
         return []

pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=56", "wheel", "setuptools_scm[toml]>=3.4.1"]
+requires = ["setuptools>=56", "setuptools_scm[toml]>=3.4.1"]
 build-backend = "setuptools.build_meta"
 
 [tool.black]

pytest.ini

@@ -2,10 +2,6 @@
 norecursedirs=dist build .tox .eggs
 addopts=--doctest-modules
 doctest_optionflags=ALLOW_UNICODE ELLIPSIS
-# workaround for warning pytest-dev/pytest#6178
-junit_family=xunit2
 filterwarnings=
 	# Suppress deprecation warning in flake8
 	ignore:SelectableGroups dict interface is deprecated::flake8
-	# Suppress deprecation warning in pypa/packaging#433
-	ignore:The distutils package is deprecated::packaging.tags

setup.cfg

@@ -15,7 +15,7 @@ classifiers =
 [options]
 packages = find_namespace:
 include_package_data = true
-python_requires = >=3.6
+python_requires = >=3.7
 install_requires =
 	zipp>=0.5
 	typing-extensions>=3.6.4; python_version < "3.8"
@@ -31,7 +31,7 @@ exclude =
 [options.extras_require]
 testing =
 	# upstream
-	pytest >= 4.6
+	pytest >= 6
 	pytest-checkdocs >= 2.4
 	pytest-flake8
 	pytest-black >= 0.3.7; \

tests/fixtures.py

@@ -11,7 +11,7 @@
 from typing import Dict, Union
 
 try:
-    from importlib import resources
+    from importlib import resources  # type: ignore
 
     getattr(resources, 'files')
     getattr(resources, 'as_file')

tests/test_api.py

@@ -245,6 +245,7 @@ def test_more_complex_deps_requires_text(self):
 
             [extra1]
             dep4
+            dep6@ git+https://example.com/python/[email protected]
 
             [extra2:python_version < "3"]
             dep5
@@ -257,6 +258,7 @@ def test_more_complex_deps_requires_text(self):
             'dep3; python_version < "3"',
             'dep4; extra == "extra1"',
             'dep5; (python_version < "3") and extra == "extra2"',
+            'dep6@ git+https://example.com/python/[email protected] ; extra == "extra1"',
         ]
         # It's important that the environment marker expression be
         # wrapped in parentheses to avoid the following 'and' binding more