diff --git a/Isolate-spawned-processes-by-unsetting-PYTHONPATH.patch b/Isolate-spawned-processes-by-unsetting-PYTHONPATH.patch deleted file mode 100644 index 8f92e3778c2e8292710578079a9dbbcb6a84ec78..0000000000000000000000000000000000000000 --- a/Isolate-spawned-processes-by-unsetting-PYTHONPATH.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 395edd9c8f055005922b8e66a21ba9f0d2a7c2fd Mon Sep 17 00:00:00 2001 -From: Karolina Surma -Date: Thu, 24 Feb 2022 09:38:54 +0100 -Subject: [PATCH] Isolate spawned processes by unsetting PYTHONPATH - ---- - setuptools/tests/environment.py | 5 +++++ - setuptools/tests/fixtures.py | 3 ++- - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/setuptools/tests/environment.py b/setuptools/tests/environment.py -index a0c0ec6..b0eac3a 100644 ---- a/setuptools/tests/environment.py -+++ b/setuptools/tests/environment.py -@@ -18,6 +18,11 @@ class VirtualEnv(jaraco.envs.VirtualEnv): - def run(self, cmd, *args, **kwargs): - cmd = [self.exe(cmd[0])] + cmd[1:] - kwargs = {"cwd": self.root, **kwargs} # Allow overriding -+ if "env" not in kwargs: -+ env = dict(os.environ) -+ if "PYTHONPATH" in env: -+ del env["PYTHONPATH"] -+ kwargs["env"] = env - return subprocess.check_output(cmd, *args, **kwargs) - - -diff --git a/setuptools/tests/fixtures.py b/setuptools/tests/fixtures.py -index 7599e65..d61ffa4 100644 ---- a/setuptools/tests/fixtures.py -+++ b/setuptools/tests/fixtures.py -@@ -98,7 +98,8 @@ def venv(tmp_path, setuptools_wheel): - env = environment.VirtualEnv() - env.root = path.Path(tmp_path / 'venv') - env.req = str(setuptools_wheel) -- return env.create() -+ with contexts.environment(PYTHONPATH=None): -+ return env.create() - - - @pytest.fixture --- -2.35.1 - diff --git a/Point-to-a-custom-pre-built-distribution-of-setuptools.patch b/Point-to-a-custom-pre-built-distribution-of-setuptools.patch deleted file mode 100644 index ba2dabcbf5924b308f169dd08bc4b7848af15942..0000000000000000000000000000000000000000 --- a/Point-to-a-custom-pre-built-distribution-of-setuptools.patch +++ /dev/null @@ -1,45 +0,0 @@ -From d00beeefc6172036ecc17ad7945e80852d5210a5 Mon Sep 17 00:00:00 2001 -From: Karolina Surma -Date: Wed, 2 Mar 2022 11:42:41 +0100 -Subject: [PATCH] Point to a custom pre-built distribution of setuptools - ---- - setuptools/tests/fixtures.py | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/setuptools/tests/fixtures.py b/setuptools/tests/fixtures.py -index d61ffa4..cc2d4d8 100644 ---- a/setuptools/tests/fixtures.py -+++ b/setuptools/tests/fixtures.py -@@ -1,7 +1,10 @@ - import contextlib -+import os - import sys - import subprocess - -+from pathlib import Path -+ - import pytest - import path - -@@ -64,6 +67,8 @@ def sample_project(tmp_path): - - @pytest.fixture(scope="session") - def setuptools_sdist(tmp_path_factory, request): -+ if os.getenv("PRE_BUILT_SETUPTOOLS_SDIST"): -+ return Path(os.getenv("PRE_BUILT_SETUPTOOLS_SDIST")).resolve() - with contexts.session_locked_tmp_dir( - request, tmp_path_factory, "sdist_build") as tmp: - dist = next(tmp.glob("*.tar.gz"), None) -@@ -79,6 +84,8 @@ def setuptools_sdist(tmp_path_factory, request): - - @pytest.fixture(scope="session") - def setuptools_wheel(tmp_path_factory, request): -+ if os.getenv("PRE_BUILT_SETUPTOOLS_WHEEL"): -+ return Path(os.getenv("PRE_BUILT_SETUPTOOLS_WHEEL")).resolve() - with contexts.session_locked_tmp_dir( - request, tmp_path_factory, "wheel_build") as tmp: - dist = next(tmp.glob("*.whl"), None) --- -2.35.1 - diff --git a/Remove-optional-or-unpackaged-test-deps.patch b/Remove-optional-or-unpackaged-test-deps.patch index df738ca18633d036d1879101f6108db5108481c7..247a1936486635ea842be0dc77e474c0f7b7d8c3 100644 --- a/Remove-optional-or-unpackaged-test-deps.patch +++ b/Remove-optional-or-unpackaged-test-deps.patch @@ -1,46 +1,45 @@ -From bc29357f2effabd91c47562d332f0ae731ffcee0 Mon Sep 17 00:00:00 2001 -From: Karolina Surma -Date: Mon, 21 Feb 2022 09:22:42 +0100 -Subject: [PATCH] Update +From 87a18ba242ac7f02d41b877ffc796dde42e6a93e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= +Date: Wed, 10 Aug 2022 16:08:41 +0200 +Subject: [PATCH] Remove optional or unpackaged test deps --- setup.cfg | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/setup.cfg b/setup.cfg -index 4a4a9a2..ce587f6 100644 +index b4ee876..094f621 100644 --- a/setup.cfg +++ b/setup.cfg -@@ -38,19 +38,8 @@ exclude = +@@ -39,19 +39,7 @@ exclude = [options.extras_require] testing = pytest >= 6 - pytest-checkdocs >= 2.4 - pytest-flake8 +- flake8 < 5 - pytest-black >= 0.3.7; \ - python_implementation != "PyPy" - pytest-cov; \ - python_implementation != "PyPy" - pytest-mypy >= 0.9.1; \ - python_implementation != "PyPy" -- pytest-enabler >= 1.0.1 +- pytest-enabler >= 1.3 - pytest-perf - mock - flake8-2020 virtualenv>=13.0.0 wheel pip>=19.1 # For proper file:// URLs support. -@@ -58,9 +47,6 @@ testing = +@@ -59,8 +47,6 @@ testing = pytest-xdist - sphinx>=4.3.2 jaraco.path>=3.2.0 -- build[virtualenv] + build[virtualenv] - filelock>=3.4.0 - pip_run>=8.8 - testing-integration = - pytest - pytest-xdist + ini2toml[lite]>=0.9 + tomli-w>=1.0.0 + pytest-timeout -- -2.35.1 +2.37.3 diff --git a/python-setuptools.spec b/python-setuptools.spec index 86c2600e21a43a29b62ef4ffa469c11bfd260686..a5f0f6a8b0ef71cb9b82a4b677ad0afc7b44fae9 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -1,20 +1,19 @@ +%define anolis_release 1 %bcond_with tests %global srcname setuptools %global python_wheel_name %{srcname}-%{version}-py3-none-any.whl Name: python-setuptools -Version: 60.9.3 -Release: 1%{?dist} +Version: 65.5.1 +Release: %{anolis_release}%{?dist} Summary: Easily build and distribute Python packages License: MIT and ASL 2.0 and (BSD or ASL 2.0) and Python URL: https://pypi.python.org/pypi/%{srcname} -Source0: https://files.pythonhosted.org/packages/14/74/54890935244ce053abcc4fa01ef4982a84743a8d128d4cf5eae56e2d156c/%{srcname}-%{version}.tar.gz +Source0: %{pypi_source %{srcname} %{version}} Patch0: Remove-optional-or-unpackaged-test-deps.patch -Patch1: Isolate-spawned-processes-by-unsetting-PYTHONPATH.patch -Patch2: Point-to-a-custom-pre-built-distribution-of-setuptools.patch BuildArch: noarch BuildRequires: python3-devel @@ -70,10 +69,15 @@ Summary: The setuptools wheel %description -n %{python_wheel_pkg_prefix}-%{srcname}-wheel A Python wheel of setuptools to use with venv. +%package -n python%{python3_pkgversion}-setuptools-doc +Summary: doc files for python%{python3_pkgversion}-setuptools +Requires: python%{python3_pkgversion}-setuptools = %{version}-%{release} + +%description -n python%{python3_pkgversion}-setuptools-doc +doc files for python%{python3_pkgversion}-setuptools. %prep %autosetup -p1 -n %{srcname}-%{version} -rm -r %{srcname}.egg-info find setuptools pkg_resources -name \*.py | xargs sed -i -e '1 {/^#!\//d}' rm -f setuptools/*.exe @@ -114,11 +118,11 @@ PYTHONPATH=$(pwd) %pytest \ --ignore=setuptools/tests/integration/ \ --ignore=setuptools/tests/test_develop.py \ -k "not test_pip_upgrade_from_source" -%endif # with tests +%endif %files -n python%{python3_pkgversion}-setuptools %{?!with_bootstrap:-f %{pyproject_files}} %license LICENSE -%doc docs/* CHANGES.rst README.rst +%doc docs/* %{python3_sitelib}/distutils-precedence.pth %files -n %{python_wheel_pkg_prefix}-%{srcname}-wheel @@ -127,7 +131,12 @@ PYTHONPATH=$(pwd) %pytest \ %dir %{python_wheel_dir}/ %{python_wheel_dir}/%{python_wheel_name} +%files -n python%{python3_pkgversion}-setuptools-doc +%doc CHANGES.rst README.rst %changelog +* Thu Feb 16 2023 mgb01105731 - 65.5.1-1 +- update to version 65.5.1 + * Wed Mar 16 2022 forrest_ly - 60.9.3-1 -- Init for Anolis OS 23 +- Init for Anolis OS 23 diff --git a/setuptools-60.9.3.tar.gz b/setuptools-60.9.3.tar.gz deleted file mode 100644 index 2d98ba9b4fafa2d1f5922cb8fcebb4b950048810..0000000000000000000000000000000000000000 Binary files a/setuptools-60.9.3.tar.gz and /dev/null differ diff --git a/setuptools-65.5.1.tar.gz b/setuptools-65.5.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..c8d075984605b6b3584a2461c13c790f0c47c7ec Binary files /dev/null and b/setuptools-65.5.1.tar.gz differ