From fee43c1726966ded0e8385ff681f780c6dd145ec Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Sep 04 2018 10:03:25 +0000 Subject: [PATCH 1/3] Enable basic venv smoke test in the CI --- diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..676a94f --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,52 @@ +--- +- hosts: localhost + roles: + - role: standard-test-basic + tags: + - classic + repositories: + - repo: "https://src.fedoraproject.org/tests/python.git" + dest: "python" + tests: + - smoke34: + dir: python/smoke + run: VERSION=3.4 ./venv.sh + - smoke35: + dir: python/smoke + run: VERSION=3.5 ./venv.sh + - smoke36: + dir: python/smoke + run: VERSION=3.6 ./venv.sh + - smoke37: + dir: python/smoke + run: VERSION=3.7 ./venv.sh + - smoke26: + dir: python/smoke + run: VERSION=2.6 METHOD=virtualenv TOX=false ./venv.sh + - smoke27: + dir: python/smoke + run: VERSION=2.7 METHOD=virtualenv ./venv.sh + - smoke34_virtualenv: + dir: python/smoke + run: VERSION=3.4 METHOD=virtualenv ./venv.sh + - smoke35_virtualenv: + dir: python/smoke + run: VERSION=3.5 METHOD=virtualenv ./venv.sh + - smoke36_virtualenv: + dir: python/smoke + run: VERSION=3.6 METHOD=virtualenv ./venv.sh + - smoke37_virtualenv: + dir: python/smoke + run: VERSION=3.7 METHOD=virtualenv ./venv.sh + required_packages: + - gcc + - /usr/bin/virtualenv + - python26 + - python27 + - python34 + - python35 + - python36 + - python37 + - python2-devel + - python3-devel + - python3-tox From 7b33de4867ebb80679daabd4073fb9b68176053b Mon Sep 17 00:00:00 2001 From: Randy Barlow Date: Sep 19 2018 17:47:56 +0000 Subject: [PATCH 2/3] Update to 40.4.1 (#1599307). Signed-off-by: Randy Barlow --- diff --git a/.gitignore b/.gitignore index fa18fc7..a04e8f5 100644 --- a/.gitignore +++ b/.gitignore @@ -90,3 +90,4 @@ /setuptools-38.4.0.zip /setuptools-39.0.1.zip /setuptools-39.2.0.zip +/setuptools-40.4.1.zip diff --git a/python-setuptools.spec b/python-setuptools.spec index f0dc153..4b0414c 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -17,8 +17,8 @@ %global python_wheeldir %{_datadir}/python-wheels Name: python-setuptools -Version: 39.2.0 -Release: 7%{?dist} +Version: 40.4.1 +Release: 1%{?dist} Summary: Easily build and distribute Python packages Group: Applications/System @@ -213,7 +213,7 @@ PYTHONDONTWRITEBYTECODE=1 PYTHONPATH=$(pwd) py.test-%{python2_version} # --ignore=setuptools/tests/test_virtualenv.py: because virtualenv executable # is configured only for Python 2 version of virtualenv—this needs to be fixed # in the `python-pytest-virtualenv` package -PYTHONDONTWRITEBYTECODE=1 PYTHONPATH=$(pwd) py.test-%{python3_version} --ignore=setuptools/tests/test_virtualenv.py +PYTHONDONTWRITEBYTECODE=1 PYTHONPATH=$(pwd) py.test-%{python3_version} --ignore=setuptools/tests/test_virtualenv.py --ignore=pavement.py %endif # with tests @@ -245,6 +245,10 @@ PYTHONDONTWRITEBYTECODE=1 PYTHONPATH=$(pwd) py.test-%{python3_version} --ignore= %changelog +* Wed Sep 19 2018 Randy Barlow - 40.4.1-1 +- Update to 40.4.1 (#1599307). +- https://github.com/pypa/setuptools/blob/v40.4.1/CHANGES.rst + * Wed Aug 15 2018 Petr Viktorin - 39.2.0-7 - Add a subpackage with wheels - Remove the python3 bcond diff --git a/sources b/sources index 884d96c..31494ec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (setuptools-39.2.0.zip) = 46baf6a48f93279d541ca10e0d71005565a7c9fbe4a8fe6b6378455edc57e5246bad3000ae9c9c47503a04e37816f9fa02e6c4328955ad16939c01c89c65d6b2 +SHA512 (setuptools-40.4.1.zip) = 36e26eabda1c205e051cc1100c7568064b52a4dfec0992743bcfb50350097f9bc82cb9f566980ca764ada036a2e25482123b6fc5c0688cbd09427cf46988c46a From 818fa297400a8c3050a17dcb1079b5b762c86efb Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Sep 24 2018 13:33:58 +0000 Subject: [PATCH 3/3] Update to 40.4.3 - fix dire DeprecationWarnings (#1627071) - list vendored libraries, adjust license --- diff --git a/.gitignore b/.gitignore index a04e8f5..8be4855 100644 --- a/.gitignore +++ b/.gitignore @@ -91,3 +91,4 @@ /setuptools-39.0.1.zip /setuptools-39.2.0.zip /setuptools-40.4.1.zip +/setuptools-40.4.3.zip diff --git a/python-setuptools.spec b/python-setuptools.spec index 4b0414c..da02737 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -17,14 +17,17 @@ %global python_wheeldir %{_datadir}/python-wheels Name: python-setuptools -Version: 40.4.1 +# When updating, update the bundled libraries versions bellow! +Version: 40.4.3 Release: 1%{?dist} Summary: Easily build and distribute Python packages - -Group: Applications/System -License: MIT +# setuptools is MIT +# packaging is BSD or ASL 2.0 +# pyparsing is MIT +# six is MIT +License: MIT and (BSD or ASL 2.0) URL: https://pypi.python.org/pypi/%{srcname} -Source0: https://files.pythonhosted.org/packages/source/s/%{srcname}/%{srcname}-%{version}.zip +Source0: %{pypi_source %{srcname} %{version} zip} # In Fedora, sudo setup.py install installs to /usr/local/lib/pythonX.Y/site-packages # But pythonX doesn't own that dir, that would be against FHS @@ -78,11 +81,19 @@ have dependencies on other packages. This package also contains the runtime components of setuptools, necessary to execute the software that requires pkg_resources.py. +# Virtual provides for the packages bundled by setuptools. +# You can find the versions in setuptools/setuptools/_vendor/vendored.txt +%global bundled() %{expand: +Provides: bundled(python%{1}dist(packaging)) = 16.8 +Provides: bundled(python%{1}dist(pyparsing)) = 2.2.1 +Provides: bundled(python%{1}dist(six)) = 1.10.0 +} %if %{with python2} %package -n python2-setuptools Summary: Easily build and distribute Python packages %{?python_provide:%python_provide python2-setuptools} +%{bundled 2} %description -n python2-setuptools Setuptools is a collection of enhancements to the Python distutils that allow @@ -97,9 +108,9 @@ execute the software that requires pkg_resources.py. %package -n python3-setuptools Summary: Easily build and distribute Python 3 packages -Group: Applications/System %{?python_provide:%python_provide python3-setuptools} Obsoletes: platform-python-setuptools < %{version}-%{release} +%{bundled 3} %description -n python3-setuptools Setuptools is a collection of enhancements to the Python 3 distutils that allow @@ -112,6 +123,8 @@ execute the software that requires pkg_resources.py. %if %{without bootstrap} %package wheel Summary: The setuptools wheel +%{bundled 2} +%{bundled 3} %description wheel A Python wheel of setuptools to use with venv. @@ -245,6 +258,11 @@ PYTHONDONTWRITEBYTECODE=1 PYTHONPATH=$(pwd) py.test-%{python3_version} --ignore= %changelog +* Mon Sep 24 2018 Miro Hrončok - 40.4.3-1 +- Update to 40.4.3 to fix dire DeprecationWarnings (#1627071) +- List vendored libraries +- https://github.com/pypa/setuptools/blob/v40.4.3/CHANGES.rst + * Wed Sep 19 2018 Randy Barlow - 40.4.1-1 - Update to 40.4.1 (#1599307). - https://github.com/pypa/setuptools/blob/v40.4.1/CHANGES.rst diff --git a/sources b/sources index 31494ec..3c216aa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (setuptools-40.4.1.zip) = 36e26eabda1c205e051cc1100c7568064b52a4dfec0992743bcfb50350097f9bc82cb9f566980ca764ada036a2e25482123b6fc5c0688cbd09427cf46988c46a +SHA512 (setuptools-40.4.3.zip) = ff4c0bb4a238a8788c533a8f22851e6b59b258c3096fba68a09e7450baf1ee47f47f86bfcd7339133b0445ec6b61fc7f0c08d7d6c4d2b231c29b724aa83d5998