devpi-builder 6.0.0__tar.gz → 7.0.0__tar.gz

{devpi-builder-6.0.0 → devpi_builder-7.0.0}/.github/workflows/tests.yml

@@ -10,8 +10,9 @@ jobs:
   test:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
@@ -21,16 +22,25 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
+        # requirements.txt omits setuptools (pip-compile); setuptools<82 needed for pkg_resources (devpi-server)
+        python -m pip install 'setuptools<82'
         python -m pip install -r requirements.txt
         python -m pip install --no-deps -e .
-        python -m pip install coveralls
+        if [ "${{ matrix.python-version }}" != "3.13" ]; then  # workaround for TheKevJames/coveralls-python#523
+          python -m pip install coveralls
+        fi
         python -m pip freeze
         python -m pip --version
         python -c 'import setuptools; print(f"setuptools=={setuptools.__version__}")'
     - name: Test with pytest
       run: |
-        pytest
+        if [ "${{ matrix.python-version }}" == "3.13" ]; then
+          pytest --no-cov  # workaround for TheKevJames/coveralls-python#523
+        else
+          pytest
+        fi
     - name: Upload coverage data
+      if: matrix.python-version != '3.13'  # workaround for TheKevJames/coveralls-python#523
       run: |
         coveralls --service=github
       env:

devpi_builder-7.0.0/.python-version

@@ -0,0 +1 @@
+3.9

{devpi-builder-6.0.0 → devpi_builder-7.0.0}/CHANGELOG.rst

@@ -5,6 +5,40 @@ Changelog
 This lists the most important changes for each release.
 
 
+Version 7.0.0 - 2026-02-16
+==========================
+
+Added
+-----
+
+* Support for Python 3.12 and 3.13.
+* Compatibility with junit-xml >= 2.0.
+
+Fixed
+-----
+
+* Ensure Setuptools and ``wheel-filename`` are installed in compatible versions.
+
+Removed
+-------
+
+* Python 3.6 to 3.8 are no longer supported. They likely still works but we will no longer run CI against it.
+* Compatibility with junit-xml < 1.9. Junit-xml 1.9 was released more than three years ago.
+
+Version 6.1.0 — 2023-09-22
+==========================
+
+Added
+-----
+
+* Support using VCS URLs in requirements files.
+
+Fixed
+-----
+
+* Building wheels for packages like ``zope-event`` that normalise the project name using dots instead of underscores is no longer broken.
+
+
 Version 6.0.0 — 2023-06-09
 ==========================
 

{devpi-builder-6.0.0 → devpi_builder-7.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: devpi-builder
-Version: 6.0.0
+Version: 7.0.0
 Summary: Devpi-builder takes a requirements.txt and incrementally fills a devpi index with wheels of the listed python packages.
 Home-page: https://github.com/blue-yonder/devpi-builder
 Author: Matthias Bach
@@ -13,14 +13,33 @@ Classifier: Intended Audience :: System Administrators
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Topic :: System :: Archiving :: Packaging
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Requires-Python: >=3.7
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 License-File: COPYING
+Requires-Dist: devpi-plumber>=0.2.14
+Requires-Dist: setuptools<82
+Requires-Dist: wheel
+Requires-Dist: wheel-filename<2
+Requires-Dist: wheel-inspect>=1.6.0
+Requires-Dist: pip>=1.5.3
+Requires-Dist: junit-xml>=1.9
+Requires-Dist: pip-requirements-parser>=32.0.1
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 =========================
 Brandon the Devpi Builder
@@ -129,6 +148,40 @@ Changelog
 This lists the most important changes for each release.
 
 
+Version 7.0.0 - 2026-02-16
+==========================
+
+Added
+-----
+
+* Support for Python 3.12 and 3.13.
+* Compatibility with junit-xml >= 2.0.
+
+Fixed
+-----
+
+* Ensure Setuptools and ``wheel-filename`` are installed in compatible versions.
+
+Removed
+-------
+
+* Python 3.6 to 3.8 are no longer supported. They likely still works but we will no longer run CI against it.
+* Compatibility with junit-xml < 1.9. Junit-xml 1.9 was released more than three years ago.
+
+Version 6.1.0 — 2023-09-22
+==========================
+
+Added
+-----
+
+* Support using VCS URLs in requirements files.
+
+Fixed
+-----
+
+* Building wheels for packages like ``zope-event`` that normalise the project name using dots instead of underscores is no longer broken.
+
+
 Version 6.0.0 — 2023-06-09
 ==========================
 

devpi_builder-7.0.0/core-requirements.txt

@@ -0,0 +1,8 @@
+devpi-plumber>=0.2.14
+setuptools<82  # setuptools 82 drops pkg_resources
+wheel
+wheel-filename<2  # wheel-filename 2 breaks imports of InvalidFilenameError, parse_wheel_filename
+wheel-inspect>=1.6.0
+pip>=1.5.3
+junit-xml>=1.9  # First version to support to_xml_report_file
+pip-requirements-parser>=32.0.1

{devpi-builder-6.0.0 → devpi_builder-7.0.0}/devpi_builder/cli.py

@@ -11,7 +11,7 @@ import locale
 import logging
 import os
 
-from junit_xml import TestSuite, TestCase
+from junit_xml import TestSuite, TestCase, to_xml_report_file
 from devpi_plumber.client import DevpiClient, DevpiClientError
 
 from devpi_builder import requirements, wheeler
@@ -114,7 +114,8 @@ class Processor(object):
 
         for package, version in packages:
             if self._should_package_be_build(package, version):
-                logger.info('Building %s %s', package, version)
+                msg = ('Building %s %s', package, version) if version else ('Building %s', package)
+                logger.info(*msg)
                 try:
                     wheel_file = self._builder(package, version)
                     self._upload_package(package, version, wheel_file)
@@ -126,7 +127,7 @@ class Processor(object):
             encoding = locale.getpreferredencoding()
             with codecs.open(self._junit_xml, 'w', encoding) as output:
                 test_suite = TestSuite('devpi-builder results', self._results)
-                TestSuite.to_file(output, [test_suite], encoding=encoding)
+                to_xml_report_file(output, [test_suite], encoding=encoding)
 
 
 def main(args=None):

{devpi-builder-6.0.0 → devpi_builder-7.0.0}/devpi_builder/requirements.py

@@ -4,6 +4,7 @@
 Functionality for reading specifications of required packages.
 """
 
+import pip_requirements_parser
 import pkg_resources
 
 
@@ -14,23 +15,25 @@ def _extract_project_version(requirement):
     :param requirement: A pkg_config Requirement
     :return: Pair of project_name and version
     """
-    specs = requirement.specs
-    if len(specs) == 1:
-        spec = specs[0]
-        if spec[0] == '==':
-            return requirement.project_name, spec[1]
-        else:
-            raise ValueError('Versions must be specified exactly. "{}" is not an exact version specification.'.format(requirement))
-    elif len(specs) > 1:
-        raise ValueError('Multiple version specifications on a single line are not supported.')
+    if requirement.is_vcs_url:
+        return requirement.line, None
+    if not requirement.specifier:
+        raise ValueError('Version specification is missing for "{}".'.format(requirement.line))
     else:
-        raise ValueError('Version specification is missing for "{}".'.format(requirement))
+        if len(requirement.specifier) == 1 and requirement.is_pinned:
+            return requirement.name, requirement.get_pinned_version
+        elif len(requirement.specifier) == 1 and not requirement.is_pinned:
+            raise ValueError('Versions must be specified exactly. "{}" is not an exact version specification.'.format(requirement.line))
+        elif len(requirement.specifier) > 1:
+            raise ValueError('Multiple version specifications on a single line are not supported.')
 
 
 def read_raw(filename):
     if filename:
-        with open(filename) as requirements_file:
-            return list(pkg_resources.parse_requirements(requirements_file))
+        rf = pip_requirements_parser.RequirementsFile.from_file(filename)
+        if rf.invalid_lines:
+            raise ValueError("There are invalid lines in requirements file: \n", "\n".join(line.dumps() for line in rf.invalid_lines))
+        return rf.requirements
     else:
         return []
 
@@ -61,7 +64,7 @@ def matched_by_list(package, version, requirements):
     version = pkg_resources.safe_version('{}'.format(version))
     package = pkg_resources.safe_name(package)
     matches = (
-        package.lower() == requirement.key and version in requirement
+        package.lower() == pkg_resources.safe_name(requirement.name) and (requirement.specifier.contains(version) if requirement.specifier else 1)
         for requirement in requirements
     )
     return any(matches)

{devpi-builder-6.0.0 → devpi_builder-7.0.0}/devpi_builder/wheeler.py

@@ -19,6 +19,7 @@ from wheel_inspect.classes import WheelFile
 
 class BuildError(Exception):
     def __init__(self, package, version, root_exception=None):
+        version = version or ""
         super(BuildError, self).__init__('Failed to create wheel for {} {}:\n{}\nOutput:\n{}'.format(
             package,
             version,
@@ -40,6 +41,10 @@ class Builder(object):
     def __exit__(self, exc_type, exc_val, exc_tb):
         shutil.rmtree(self.scratch_dir)
 
+    @staticmethod
+    def _standardize_package_name(name):
+        return name.replace(".", "-")
+
     def _matches_requirement(self, requirement, wheels):
         """
         List wheels matching a requirement.
@@ -52,7 +57,7 @@ class Builder(object):
         matching = []
         for wheel in wheels:
             w = wheel.parsed_filename
-            dist = Distribution(project_name=w.project, version=w.version)
+            dist = Distribution(project_name=self._standardize_package_name(w.project), version=w.version)
             if dist in req:
                 matching.append(wheel.path)
         return matching
@@ -63,7 +68,9 @@ class Builder(object):
         Find a wheel with the given name and version
         """
         candidates = [WheelFile(filename) for filename in glob.iglob(path.join(self.wheelhouse, '*.whl'))]
-        matches = self._matches_requirement('{}=={}'.format(name, version), candidates)
+        name = self._standardize_package_name(name)
+        requirement = '{}=={}'.format(name, version) if version else name
+        matches = self._matches_requirement(requirement, candidates)
         if len(matches) > 0:
             return str(matches[0])
         else:
@@ -81,7 +88,7 @@ class Builder(object):
             subprocess.check_output([
                 'pip', 'wheel',
                 '--wheel-dir=' + self.wheelhouse,
-                '{}=={}'.format(package, version)
+                '{}=={}'.format(package, version) if version else package,
             ], stderr=subprocess.STDOUT)
             return self._find_wheel(package, version)
         except subprocess.CalledProcessError as e:

{devpi-builder-6.0.0 → devpi_builder-7.0.0}/devpi_builder.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: devpi-builder
-Version: 6.0.0
+Version: 7.0.0
 Summary: Devpi-builder takes a requirements.txt and incrementally fills a devpi index with wheels of the listed python packages.
 Home-page: https://github.com/blue-yonder/devpi-builder
 Author: Matthias Bach
@@ -13,14 +13,33 @@ Classifier: Intended Audience :: System Administrators
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Topic :: System :: Archiving :: Packaging
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Requires-Python: >=3.7
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 License-File: COPYING
+Requires-Dist: devpi-plumber>=0.2.14
+Requires-Dist: setuptools<82
+Requires-Dist: wheel
+Requires-Dist: wheel-filename<2
+Requires-Dist: wheel-inspect>=1.6.0
+Requires-Dist: pip>=1.5.3
+Requires-Dist: junit-xml>=1.9
+Requires-Dist: pip-requirements-parser>=32.0.1
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 =========================
 Brandon the Devpi Builder
@@ -129,6 +148,40 @@ Changelog
 This lists the most important changes for each release.
 
 
+Version 7.0.0 - 2026-02-16
+==========================
+
+Added
+-----
+
+* Support for Python 3.12 and 3.13.
+* Compatibility with junit-xml >= 2.0.
+
+Fixed
+-----
+
+* Ensure Setuptools and ``wheel-filename`` are installed in compatible versions.
+
+Removed
+-------
+
+* Python 3.6 to 3.8 are no longer supported. They likely still works but we will no longer run CI against it.
+* Compatibility with junit-xml < 1.9. Junit-xml 1.9 was released more than three years ago.
+
+Version 6.1.0 — 2023-09-22
+==========================
+
+Added
+-----
+
+* Support using VCS URLs in requirements files.
+
+Fixed
+-----
+
+* Building wheels for packages like ``zope-event`` that normalise the project name using dots instead of underscores is no longer broken.
+
+
 Version 6.0.0 — 2023-06-09
 ==========================
 

{devpi-builder-6.0.0 → devpi_builder-7.0.0}/devpi_builder.egg-info/SOURCES.txt

@@ -1,14 +1,15 @@
 .coveragerc
 .gitignore
+.python-version
 .pyup.yml
 CHANGELOG.rst
 COPYING
 MANIFEST.in
 README.rst
 core-requirements.txt
+pyproject.toml
 requirements.in
 requirements.txt
-setup.cfg
 setup.py
 .github/workflows/publish.yml
 .github/workflows/tests.yml
@@ -38,6 +39,7 @@ tests/fixture/sample_non-ascii.txt
 tests/fixture/sample_pure_and_non-pure.txt
 tests/fixture/sample_simple.txt
 tests/fixture/sample_test_package.txt
+tests/fixture/sample_vcs.txt
 tests/fixture/non-ascii_package/setup.cfg
 tests/fixture/non-ascii_package/setup.py
 tests/fixture/non-ascii_package/dist/non-ascii-package-0.1.dev1.tar.gz

devpi_builder-7.0.0/devpi_builder.egg-info/requires.txt

@@ -0,0 +1,8 @@
+devpi-plumber>=0.2.14
+setuptools<82
+wheel
+wheel-filename<2
+wheel-inspect>=1.6.0
+pip>=1.5.3
+junit-xml>=1.9
+pip-requirements-parser>=32.0.1

devpi_builder-7.0.0/pyproject.toml

@@ -0,0 +1,8 @@
+[build-system]
+requires = ["setuptools>=64", "setuptools_scm>=8"]
+build-backend = "setuptools.build_meta"
+
+[tool.setuptools_scm]
+
+[tool.pytest.ini_options]
+addopts = "--cov-report= --cov=devpi_builder tests"

{devpi-builder-6.0.0 → devpi_builder-7.0.0}/requirements.in

@@ -1,8 +1,9 @@
 -r core-requirements.txt
 
 setuptools_scm
-pytest
+pytest>=6.2  # Minimum version we know yield_fixture to be an alias for fixture
 pytest-cov
 pytest-mock
 mock
 devpi-plumber[test]>=0.4.3
+legacy-cgi

{devpi-builder-6.0.0 → devpi_builder-7.0.0}/requirements.txt

@@ -1,184 +1,187 @@
 #
-# This file is autogenerated by pip-compile with Python 3.7
+# This file is autogenerated by pip-compile with Python 3.9
 # by the following command:
 #
-#    pip-compile --no-emit-index-url
+#    pip-compile --no-emit-index-url --strip-extras
 #
-aiohttp==3.8.3
-    # via devpi-server
-aiosignal==1.2.0
-    # via aiohttp
-argon2-cffi==21.3.0
+anyio==4.9.0
+    # via httpx
+argon2-cffi==23.1.0
     # via
     #   devpi-server
     #   passlib
 argon2-cffi-bindings==21.2.0
     # via argon2-cffi
-async-timeout==4.0.2
-    # via aiohttp
-attrs==21.4.0
+attrs==25.3.0
     # via
-    #   aiohttp
     #   devpi-server
-    #   pytest
+    #   headerparser
     #   wheel-inspect
-bleach==5.0.1
-    # via readme-renderer
-build==0.8.0
-    # via check-manifest
-certifi==2022.12.7
-    # via requests
-cffi==1.15.0
-    # via argon2-cffi-bindings
-charset-normalizer==2.0.12
+build==1.2.2.post1
     # via
-    #   aiohttp
+    #   check-manifest
+    #   devpi-client
+certifi==2025.1.31
+    # via
+    #   httpcore
+    #   httpx
     #   requests
-check-manifest==0.48
+cffi==1.17.1
+    # via argon2-cffi-bindings
+charset-normalizer==3.4.1
+    # via requests
+check-manifest==0.50
     # via devpi-client
-coverage[toml]==6.4.1
+coverage==7.8.0
     # via pytest-cov
 defusedxml==0.7.1
     # via devpi-server
-devpi-client==5.2.3
+deprecated==1.2.18
+    # via headerparser
+devpi-client==7.2.0
     # via devpi-plumber
-devpi-common==3.6.0
+devpi-common==4.0.4
     # via
     #   devpi-client
     #   devpi-server
-devpi-plumber[test]==0.6.0
+devpi-plumber==0.7.0
     # via
     #   -r core-requirements.txt
     #   -r requirements.in
-devpi-server==6.5.1
+devpi-server==6.14.0
     # via devpi-plumber
-distlib==0.3.4
-    # via virtualenv
-docutils==0.19
+docutils==0.21.2
     # via readme-renderer
-entry-points-txt==0.1.0
+entry-points-txt==0.2.1
     # via wheel-inspect
-filelock==3.7.1
-    # via
-    #   tox
-    #   virtualenv
-frozenlist==1.3.3
+exceptiongroup==1.2.2
     # via
-    #   aiohttp
-    #   aiosignal
-headerparser==0.4.0
+    #   anyio
+    #   pytest
+h11==0.16.0
+    # via httpcore
+headerparser==0.5.2
     # via wheel-inspect
-hupper==1.10.3
+httpcore==1.0.9
+    # via httpx
+httpx==0.28.1
+    # via devpi-server
+hupper==1.12.1
     # via pyramid
-idna==3.3
+idna==3.10
     # via
+    #   anyio
+    #   httpx
     #   requests
-    #   yarl
-iniconfig==1.1.1
-    # via pytest
-itsdangerous==2.1.2
+importlib-metadata==8.6.1
+    # via
+    #   build
+    #   setuptools-scm
+iniconfig==2.1.0
+    # via
+    #   devpi-client
+    #   pytest
+itsdangerous==2.2.0
     # via devpi-server
 junit-xml==1.9
     # via -r core-requirements.txt
-lazy==1.4
+lazy==1.6
     # via
     #   devpi-common
     #   devpi-server
-mock==4.0.3
+legacy-cgi==2.6.4
     # via -r requirements.in
-multidict==6.0.2
-    # via
-    #   aiohttp
-    #   yarl
-packaging==21.3
+mock==5.2.0
+    # via -r requirements.in
+nh3==0.2.21
+    # via readme-renderer
+packaging==25.0
     # via
     #   build
+    #   packaging-legacy
+    #   pip-requirements-parser
     #   pytest
     #   setuptools-scm
-    #   tox
+    #   wheel
     #   wheel-inspect
-passlib[argon2]==1.7.4
+packaging-legacy==23.0.post0
+    # via devpi-common
+passlib==1.7.4
     # via devpi-server
-pastedeploy==2.1.1
+pastedeploy==3.1.0
     # via plaster-pastedeploy
-pep517==0.12.0
-    # via build
-pkginfo==1.8.2
+pip-requirements-parser==32.0.1
+    # via -r core-requirements.txt
+pkginfo==1.12.1.2
     # via devpi-client
-plaster==1.0
+plaster==1.1.2
     # via
     #   plaster-pastedeploy
     #   pyramid
-plaster-pastedeploy==0.7
+plaster-pastedeploy==1.0.1
     # via pyramid
-platformdirs==2.5.2
-    # via
-    #   devpi-server
-    #   virtualenv
-pluggy==1.0.0
+platformdirs==4.3.7
     # via
     #   devpi-client
     #   devpi-server
-    #   pytest
-    #   tox
-py==1.11.0
+pluggy==1.5.0
     # via
     #   devpi-client
-    #   devpi-common
     #   devpi-server
     #   pytest
-    #   tox
-pycparser==2.21
+py==1.11.0
+    # via devpi-server
+pycparser==2.22
     # via cffi
-pygments==2.13.0
+pygments==2.19.1
     # via readme-renderer
-pyparsing==3.0.9
-    # via packaging
-pyramid==2.0
+pyparsing==3.2.3
+    # via pip-requirements-parser
+pyproject-hooks==1.2.0
+    # via build
+pyramid==2.0.2
     # via devpi-server
-pytest==7.1.2
+pytest==8.3.5
     # via
     #   -r requirements.in
     #   pytest-cov
     #   pytest-mock
-pytest-cov==3.0.0
+pytest-cov==6.1.1
     # via -r requirements.in
-pytest-mock==3.10.0
+pytest-mock==3.14.0
     # via -r requirements.in
-python-dateutil==2.8.2
+python-dateutil==2.9.0.post0
     # via strictyaml
-readme-renderer==37.3
+readme-renderer==44.0
     # via wheel-inspect
 repoze-lru==0.7
     # via devpi-server
-requests==2.31.0
+requests==2.32.4
     # via
     #   devpi-common
     #   devpi-plumber
-ruamel-yaml==0.17.21
+ruamel-yaml==0.18.10
     # via devpi-server
-setuptools-scm==6.4.2
+ruamel-yaml-clib==0.2.12
+    # via ruamel-yaml
+setuptools-scm==8.3.1
     # via -r requirements.in
-six==1.16.0
+six==1.17.0
     # via
-    #   bleach
-    #   headerparser
     #   junit-xml
     #   python-dateutil
-    #   tox
-    #   virtualenv
-strictyaml==1.6.1
+sniffio==1.3.1
+    # via anyio
+strictyaml==1.7.3
     # via devpi-server
-toml==0.10.2
-    # via tox
-tomli==2.0.1
+tomli==2.2.1
     # via
+    #   build
     #   check-manifest
-    #   pep517
+    #   coverage
+    #   devpi-client
     #   pytest
     #   setuptools-scm
-tox==3.25.0
-    # via devpi-client
 translationstring==1.4
     # via pyramid
 twitter-common-contextutil==0.3.11
@@ -187,31 +190,33 @@ twitter-common-dirutil==0.3.11
     # via twitter-common-contextutil
 twitter-common-lang==0.3.11
     # via twitter-common-dirutil
-urllib3==1.26.9
+typing-extensions==4.13.2
+    # via
+    #   anyio
+    #   setuptools-scm
+urllib3==2.6.3
     # via requests
-venusian==3.0.0
+venusian==3.1.1
     # via pyramid
-virtualenv==20.14.1
-    # via tox
-waitress==2.1.2
+waitress==3.0.2
     # via devpi-server
-webencodings==0.5.1
-    # via bleach
-webob==1.8.7
+webob==1.8.9
     # via pyramid
-wheel==0.38.4
+wheel==0.46.2
     # via -r core-requirements.txt
-wheel-filename==1.4.1
+wheel-filename==1.4.2
     # via
     #   -r core-requirements.txt
     #   wheel-inspect
-wheel-inspect==1.7.1
+wheel-inspect==1.7.2
     # via -r core-requirements.txt
-yarl==1.8.2
-    # via aiohttp
-zope-deprecation==4.4.0
+wrapt==1.17.2
+    # via deprecated
+zipp==3.21.0
+    # via importlib-metadata
+zope-deprecation==5.1
     # via pyramid
-zope-interface==5.4.0
+zope-interface==7.2
     # via pyramid
 
 # The following packages are considered to be unsafe in a requirements file:

devpi_builder-7.0.0/setup.cfg

@@ -0,0 +1,4 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+

{devpi-builder-6.0.0 → devpi_builder-7.0.0}/setup.py

@@ -19,10 +19,7 @@ setup(
     long_description_content_type='text/x-rst',
     license='new BSD',
     install_requires=requirements,
-    python_requires='>=3.7',
-    setup_requires=[
-        'setuptools_scm',
-    ],
+    python_requires='>=3.9',
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Environment :: Console',
@@ -31,11 +28,11 @@ setup(
         'License :: OSI Approved :: BSD License',
         'Topic :: System :: Archiving :: Packaging',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.7',
-        'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
+        'Programming Language :: Python :: 3.13',
     ],
     entry_points={
         'console_scripts': [

devpi_builder-7.0.0/tests/fixture/sample_vcs.txt

@@ -0,0 +1,3 @@
+requests @ git+https://github.com/kennethreitz/requests@master
+requests @ git+ssh://github.com/kennethreitz/requests@master
+requests @ git+https://github.com/kennethreitz/requests@2.16.0

{devpi-builder-6.0.0 → devpi_builder-7.0.0}/tests/test_cli.py

@@ -3,6 +3,7 @@
 import xml.etree.ElementTree as ET
 
 import pytest
+import requests
 
 from mock import patch
 from devpi_plumber.server import TestServer
@@ -26,7 +27,7 @@ INDICES = {
 }
 
 
-@pytest.yield_fixture()
+@pytest.fixture()
 def devpi():
     with TestServer(USERS, INDICES) as _devpi:
         yield _devpi
@@ -162,7 +163,7 @@ def _assert_junit_xml_content(junit_filename, run_id=None):
     root = ET.parse(junit_filename)
     ET.dump(root)
 
-    _assert_test_case(root, 'failure', 'package-that-hopefully-not-exists 99.999' + run_id_str)
+    _assert_test_case(root, 'failure', 'package_that_hopefully_not_exists 99.999' + run_id_str)
     _assert_test_case(root, 'skipped', 'test-package 0.1.dev1' + run_id_str)
 
     pb_elems = root.findall(".//testcase[@name='progressbar 2.2{}']".format(run_id_str))
@@ -187,20 +188,28 @@ def test_reports_junit_xml(devpi, tmpdir):
     _assert_junit_xml_content(junit_filename)
 
 
-def test_handles_non_ascii_build_output(devpi, tmpdir, monkeypatch):
-    monkeypatch.setenv('PIP_INDEX_URL', devpi.url + '/' + PURE_INDEX)
+def test_handles_non_ascii_build_output(tmpdir, monkeypatch):
 
-    with DevpiClient(devpi.server_url + '/' + PURE_INDEX,
-                     USER,
-                     PASSWORD) as client:
-        client.upload('tests/fixture/non-ascii_package/dist/non-ascii-package-0.1.dev1.tar.gz')
+    with TestServer(USERS, {
+        PURE_INDEX: {'bases': '/root/pypi'},
+        INDEX: {'bases': ''},
+    }) as devpi:
+        sdist_index = devpi.url + '/' + PURE_INDEX
 
-    junit_filename = str(tmpdir.join('junit.xml'))
+        monkeypatch.setenv('PIP_INDEX_URL', sdist_index)
 
-    # our main assertion is that the main does not fail
-    main(['tests/fixture/sample_non-ascii.txt', devpi.url + '/' + INDEX,
-          '--user={}'.format(USER),
-          '--password={}'.format(PASSWORD), '--junit-xml', junit_filename])
+        # trigger retrieval of setuptools from upstream as that can take forever
+        requests.get(sdist_index + '/+simple/setuptools/', timeout=300).raise_for_status()
+
+        with DevpiClient(sdist_index, USER, PASSWORD) as client:
+            client.upload('tests/fixture/non-ascii_package/dist/non-ascii-package-0.1.dev1.tar.gz')
+
+        junit_filename = str(tmpdir.join('junit.xml'))
+
+        # our main assertion is that the main does not fail
+        main(['tests/fixture/sample_non-ascii.txt', devpi.url + '/' + INDEX,
+              '--user={}'.format(USER),
+              '--password={}'.format(PASSWORD), '--junit-xml', junit_filename])
 
     # check that the build failure shows up in the build output
     assert 'No non-ascii 4 you!' in open(junit_filename).read()

{devpi-builder-6.0.0 → devpi_builder-7.0.0}/tests/test_requirements.py

@@ -8,10 +8,19 @@ from devpi_builder import requirements
 def test_read_requirements():
     expected = [
         ('progressbar', '2.2'),
-        ('six', '1.7.3')
+        ('six', '1.7.3'),
     ]
     assert expected == requirements.read_exact_versions('tests/fixture/sample_simple.txt')
 
+def test_read_vcs_requirements():
+    expected = [
+        ('requests @ git+https://github.com/kennethreitz/requests@master', None),
+        ('requests @ git+ssh://github.com/kennethreitz/requests@master', None),
+        ('requests @ git+https://github.com/kennethreitz/requests@2.16.0', None),
+    ]
+    assert expected == requirements.read_exact_versions('tests/fixture/sample_vcs.txt')
+
+
 
 def test_multiple_versions():
     expected = [

{devpi-builder-6.0.0 → devpi_builder-7.0.0}/tests/test_wheeler.py

@@ -9,9 +9,19 @@ from devpi_builder import wheeler
 
 
 class TestBuilder:
-    def test_build(self):
+    @pytest.mark.parametrize(
+        'args', (
+            ('progressbar', '2.2'),
+            ('progressbar', None),
+            ('requests @ git+https://github.com/kennethreitz/requests@2.16.0', None),
+            ('requests @ git+https://github.com/kennethreitz/requests@master', None),
+            ('zope-event', '5.0'),
+            ('devpi-common', '3.6.0'),
+        )
+    )
+    def test_build(self, args):
         with wheeler.Builder() as builder:
-            wheel_file = builder('progressbar', '2.2')
+            wheel_file = builder(*args)
             assert re.match(r'.*\.whl$', wheel_file)
             assert path.exists(wheel_file)
 

devpi-builder-6.0.0/core-requirements.txt

@@ -1,7 +0,0 @@
-devpi-plumber>=0.2.14
-setuptools
-wheel
-wheel-filename
-wheel-inspect>=1.6.0
-pip>=1.5.3
-junit-xml

devpi-builder-6.0.0/devpi_builder.egg-info/requires.txt

@@ -1,7 +0,0 @@
-devpi-plumber>=0.2.14
-setuptools
-wheel
-wheel-filename
-wheel-inspect>=1.6.0
-pip>=1.5.3
-junit-xml

devpi-builder-6.0.0/setup.cfg

@@ -1,10 +0,0 @@
-[tool:pytest]
-addopts = --cov-report= --cov=devpi_builder tests
-
-[aliases]
-test = pytest
-
-[egg_info]
-tag_build = 
-tag_date = 0
-