diff --git a/devpi-client-6.0.5.tar.gz b/devpi-client-6.0.5.tar.gz deleted file mode 100644 index 62b68bf..0000000 --- a/devpi-client-6.0.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2b375c012c8910e40365b2d169f0446c701c202ee2c6a0d014bcb884cfea0196 -size 90240 diff --git a/devpi-client-7.0.1.tar.gz b/devpi-client-7.0.1.tar.gz new file mode 100644 index 0000000..92d20cd --- /dev/null +++ b/devpi-client-7.0.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8bcb292d9bcf56ed43992ffbc4ab14559c6c6a05f8019ccaeeba9c5d3466d383 +size 1758752 diff --git a/python-devpi-client.changes b/python-devpi-client.changes index afd02ad..731f46a 100644 --- a/python-devpi-client.changes +++ b/python-devpi-client.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Tue Oct 17 03:16:43 UTC 2023 - Steve Kowalik + +- Update to 7.0.1: + * Bug Fixes + + Fix #1005: use ``shutil.move`` instead of ``Path.rename`` to move + distribution after building to prevent cross-device link errors. + + Fix #1008: pass ``--no-isolation`` option to ``build`` when determining + name/version for documentation. + + Fix #946: output ``name==version`` instead of ``name-version`` for + ``devpi list -v``. + * Deprecations and Removals + + Use ``build`` instead of deprecated ``pep517`` package. + + Removed dependency on py package. + + Dropped support for Python <= 3.6. +- Drop patch switch-to-build-module.patch, included upstream. +- Switch to autosetup macro. + ------------------------------------------------------------------- Tue Jul 4 10:32:15 UTC 2023 - Torsten Gruner diff --git a/python-devpi-client.spec b/python-devpi-client.spec index 7f1d3f7..fc7ea11 100644 --- a/python-devpi-client.spec +++ b/python-devpi-client.spec @@ -26,14 +26,12 @@ %endif %{?sle15_python_module_pythons} Name: python-devpi-client%{psuffix} -Version: 6.0.5 +Version: 7.0.1 Release: 0 Summary: Client for devpi License: MIT URL: https://github.com/devpi/devpi Source: https://files.pythonhosted.org/packages/source/d/devpi-client/devpi-client-%{version}.tar.gz -# PATCH-FIX-UPSTREAM gh#devpi/devpi#966 -Patch0: switch-to-build-module.patch BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module wheel} @@ -41,14 +39,13 @@ BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-build Requires: python-check-manifest >= 0.28 -Requires: python-devpi-common >= 3.6.0 +Requires: python-devpi-common >= 4.0 Requires: python-iniconfig Requires: python-pkginfo >= 1.4.2 Requires: python-platformdirs Requires: python-pluggy >= 0.6.0 -Requires: python-py >= 1.4.31 Requires: python-tox >= 3.1.0 -Requires: python-wheel +Requires: python-virtualenv Requires(post): update-alternatives Requires(postun):update-alternatives Recommends: git-core @@ -57,18 +54,11 @@ BuildArch: noarch # SECTION test requirements %if %{with test} BuildRequires: %{python_module Sphinx} -BuildRequires: %{python_module build} -BuildRequires: %{python_module check-manifest >= 0.28} BuildRequires: %{python_module colorama} BuildRequires: %{python_module devpi-client = %{version}} -BuildRequires: %{python_module devpi-common >= 3.6.0} +BuildRequires: %{python_module devpi-common >= 4} BuildRequires: %{python_module devpi-server} -BuildRequires: %{python_module pkginfo >= 1.4.2} -BuildRequires: %{python_module pluggy >= 0.6.0} -BuildRequires: %{python_module py >= 1.4.31} BuildRequires: %{python_module pytest} -BuildRequires: %{python_module tox >= 3.1.0} -BuildRequires: %{python_module wheel} BuildRequires: git-core %endif # /SECTION @@ -80,9 +70,8 @@ indexes, uploading to and installing from indexes, as well as a "test" command for invoking tox. %prep -%setup -q -n devpi-client-%{version} +%autosetup -p1 -n devpi-client-%{version} rm tox.ini -%autopatch -p1 sed -i 's/"python \(setup.py[^"]*\)"/(sys.executable + " \1")/' testing/test_upload.py sed -i 's/"python", "setup.py"/sys.executable, "setup.py"/' testing/test_test.py diff --git a/switch-to-build-module.patch b/switch-to-build-module.patch deleted file mode 100644 index 61f1726..0000000 --- a/switch-to-build-module.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 95af2bd5eb0636a64820d6a63462a8d4cfb033ba Mon Sep 17 00:00:00 2001 -From: Steve Kowalik -Date: Thu, 20 Apr 2023 16:20:37 +1000 -Subject: [PATCH] client: Use build instead of pep517 - -pep517 has been renamed to pyproject-hooks, and as a consequence all of -the deprecated functionality has been removed. Users of that -functionality should switch to using build. Switch to using a method -under build.util to determine the wheel metadata for upload. ---- - client/devpi/upload.py | 10 ++++++---- - client/setup.py | 1 - - 2 files changed, 6 insertions(+), 5 deletions(-) - -diff --git a/client/devpi/upload.py b/client/devpi/upload.py -index ded4245e..4a946128 100644 ---- a/devpi/upload.py -+++ b/devpi/upload.py -@@ -5,8 +5,8 @@ - import re - import zipfile - -+import build.util - import check_manifest --import pep517.meta - - from devpi_common.metadata import Version, get_pyversion_filetype - from devpi_common.archive import Archive -@@ -378,9 +378,11 @@ def __str__(self): - return "" % self.rootpath - - def setup_name_and_version(self): -- result = pep517.meta.load(self.rootpath.strpath) -- name = result.metadata["name"] -- version = result.metadata["version"] -+ metadata = build.util.project_wheel_metadata( -+ self.rootpath.strpath, False -+ ) -+ name = metadata["name"] -+ version = metadata["version"] - self.hub.debug("name, version = %s, %s" % (name, version)) - return name, version - -diff --git a/client/setup.py b/client/setup.py -index 7d9a98cc..92e7ff95 100755 ---- a/setup.py -+++ b/setup.py -@@ -31,7 +31,6 @@ def get_changelog(): - "check-manifest>=0.28", - "devpi_common<4,>=3.6.0", - "iniconfig", -- "pep517", - "pkginfo>=1.4.2", - "platformdirs", - "pluggy>=0.6.0,<2.0",