diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..fcc7b97 --- /dev/null +++ b/_multibuild @@ -0,0 +1,3 @@ + + test + diff --git a/devpi-client-6.0.4.tar.gz b/devpi-client-6.0.4.tar.gz deleted file mode 100644 index 8866a35..0000000 --- a/devpi-client-6.0.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b87309e9af657ea4f104381b29816afc08f8821920091ca182fdbb11ec9f00d6 -size 91617 diff --git a/devpi-client-6.0.5.tar.gz b/devpi-client-6.0.5.tar.gz new file mode 100644 index 0000000..62b68bf --- /dev/null +++ b/devpi-client-6.0.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b375c012c8910e40365b2d169f0446c701c202ee2c6a0d014bcb884cfea0196 +size 90240 diff --git a/python-devpi-client.changes b/python-devpi-client.changes index f6cfc4c..afd02ad 100644 --- a/python-devpi-client.changes +++ b/python-devpi-client.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Jul 4 10:32:15 UTC 2023 - Torsten Gruner + +- update to 6.0.5 + * Remember URL when ``devpi use`` causes a 403, so one can + use ``devpi login`` afterwards. + * Fix #978: Quote username and password when adding to URL. + * Fix #980: Remove long deprecated backward compatibility for + old pluggy versions to fix error with pluggy 1.1.0. +- split package to prevent build dependency with python-tox (multibuild) + ------------------------------------------------------------------- Mon Jul 3 13:00:13 UTC 2023 - Matej Cepl diff --git a/python-devpi-client.spec b/python-devpi-client.spec index afe4a42..7f1d3f7 100644 --- a/python-devpi-client.spec +++ b/python-devpi-client.spec @@ -1,5 +1,5 @@ # -# spec file for package python-devpi-client +# spec file # # Copyright (c) 2023 SUSE LLC # @@ -16,9 +16,17 @@ # +%global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "test" +%define psuffix -test +%bcond_without test +%else +%define psuffix %{nil} +%bcond_with test +%endif %{?sle15_python_module_pythons} -Name: python-devpi-client -Version: 6.0.4 +Name: python-devpi-client%{psuffix} +Version: 6.0.5 Release: 0 Summary: Client for devpi License: MIT @@ -47,10 +55,12 @@ Recommends: git-core Recommends: python-Sphinx 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-server} BuildRequires: %{python_module pkginfo >= 1.4.2} @@ -60,6 +70,7 @@ BuildRequires: %{python_module pytest} BuildRequires: %{python_module tox >= 3.1.0} BuildRequires: %{python_module wheel} BuildRequires: git-core +%endif # /SECTION %python_subpackages @@ -80,11 +91,14 @@ sed -i 's/"python", "setup.py"/sys.executable, "setup.py"/' testing/test_test.py %pyproject_wheel %install +%if !%{with test} %pyproject_install %python_clone -a %{buildroot}%{_bindir}/devpi %python_expand %fdupes %{buildroot}%{$python_sitelib} +%endif %check +%if %{with test} export LANG=en_US.UTF-8 export PYTHONDONTWRITEBYTECODE=1 export PATH=$PATH:%{buildroot}/%{_bindir} @@ -99,6 +113,7 @@ donttest+=" or test_derive_devpi_token or test_derive_legacy_token or test_deriv # error deleting VIRTUAL_ENV donttest+=" or test_simple_install_missing_venvdir" %pytest -k "not ($donttest)" +%endif %post %python_install_alternative devpi @@ -106,11 +121,13 @@ donttest+=" or test_simple_install_missing_venvdir" %postun %python_uninstall_alternative devpi +%if !%{with test} %files %{python_files} %doc AUTHORS CHANGELOG README.rst %license LICENSE %python_alternative %{_bindir}/devpi %{python_sitelib}/devpi %{python_sitelib}/devpi_client-%{version}*-info +%endif %changelog