From 57b78009b4e93ffa25f55b2651dc9d2223656fac66b8ca07f489c604215fff30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 19 Mar 2020 07:34:39 +0000 Subject: [PATCH 1/2] - Fix build without python2 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pypiserver?expand=0&rev=3 --- python-pypiserver.changes | 5 +++++ python-pypiserver.spec | 27 ++++++++++++++------------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/python-pypiserver.changes b/python-pypiserver.changes index 1077a71..c5447d0 100644 --- a/python-pypiserver.changes +++ b/python-pypiserver.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 19 07:34:24 UTC 2020 - Tomáš Chvátal + +- Fix build without python2 + ------------------------------------------------------------------- Tue May 14 23:38:33 UTC 2019 - svasudevan@suse.com diff --git a/python-pypiserver.spec b/python-pypiserver.spec index 14386b3..644f73b 100644 --- a/python-pypiserver.spec +++ b/python-pypiserver.spec @@ -1,7 +1,7 @@ # # spec file for package python-pypiserver # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,35 +12,36 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %{?!python_module:%define python_module() python-%{**} python3-%{**}} +%bcond_without python2 Name: python-pypiserver Version: 1.3.0 Release: 0 Summary: Minimal PyPI server for uploading & downloading packages with pip/easy_install License: MIT -Group: Development/Languages/Python -Url: https://github.com/pypiserver +URL: https://github.com/pypiserver Source: https://github.com/pypiserver/pypiserver/archive/v%{version}.tar.gz#/pypiserver-%{version}.tar.gz +BuildRequires: %{python_module WebTest} +BuildRequires: %{python_module passlib >= 1.6} +BuildRequires: %{python_module pip >= 7} BuildRequires: %{python_module pytest >= 3.5} +BuildRequires: %{python_module setuptools-git >= 0.3} BuildRequires: %{python_module setuptools_scm >= 1.15.0} BuildRequires: %{python_module setuptools} -BuildRequires: %{python_module setuptools-git >= 0.3} -BuildRequires: %{python_module pip >= 7} -BuildRequires: %{python_module passlib >= 1.6} -BuildRequires: %{python_module wheel >= 0.25.0} -BuildRequires: %{python_module twine} BuildRequires: %{python_module tox} -BuildRequires: %{python_module WebTest} +BuildRequires: %{python_module twine} +BuildRequires: %{python_module wheel >= 0.25.0} BuildRequires: fdupes -BuildRequires: python-mock BuildRequires: python-rpm-macros Requires: python-passlib >= 1.6 BuildArch: noarch - +%if %{with python2} +BuildRequires: python-mock +%endif %python_subpackages %description @@ -65,6 +66,6 @@ rm -f pytest.ini %doc README.rst %license LICENSE.txt %{python_sitelib}/* -%python3_only /usr/bin/pypi-server +%python3_only %{_bindir}/pypi-server %changelog From dd5c2466f3c53aa3d365eb4647162a1eebdd81b1503543286c3d2c7c6429aafa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 23 Mar 2020 14:07:28 +0000 Subject: [PATCH 2/2] Accepting request 787494 from home:pgajdos:python - version update to 1.3.2 - ENH: The Dockerfile used for the official Docker images now uses Python 3.6 rather than Python 2.7 (#284, thanks @etene!) - ENH: The `welcome.html` page has been updated to provide more metadata and be more HTML-standards compliant (#283, thanks @maggyero!) - FIX: the `pypi-server -U` command no longer fails when run inside the Docker container (thanks to @mkolb-navican for reporting in #264) - FIX: The `remove_pkg` API action now removes any extant instances of a package name-version combination, not just the first one found. This means that now, for example, if a `.whl` and `.tar.gz` file exist for the requested package name and version, both will be removed (thanks to @esciara for reporting in #268) - FIX: include missing `simple/` path on a URL in the example pip commands on the `welcome.html` page (@276, thanks @maggyero!) - DOC: more consistent and accurate documentation for pip commands provided on the `welcome.html` page (#278, thanks @maggyero!) - DOC: fixes to the README to make it easier for people to use pypiserver behind an apache webserver (#289, thanks @Helveg!) - FIX: previously, it was possible to upload packages with hashing algorithms other than md5, but downloading them again with pip was impossible due to incorrect truncation of the hash. This has been fixed! (Thanks @ArneBachmann for figuring out what was wrong and reporting the issue in #265). - FIX: argument parsing would previously fail for the short form of ``--help``, due an incorrect operator used during comparison (thanks to @maggyero, #271) - DOC: significant improvements to formatting and consistency in the README (thanks to @maggyero, #270) OBS-URL: https://build.opensuse.org/request/show/787494 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pypiserver?expand=0&rev=4 --- pypiserver-1.3.0.tar.gz | 3 --- pypiserver-1.3.2.tar.gz | 3 +++ python-pypiserver.changes | 32 ++++++++++++++++++++++++++++++++ python-pypiserver.spec | 8 ++++++-- 4 files changed, 41 insertions(+), 5 deletions(-) delete mode 100644 pypiserver-1.3.0.tar.gz create mode 100644 pypiserver-1.3.2.tar.gz diff --git a/pypiserver-1.3.0.tar.gz b/pypiserver-1.3.0.tar.gz deleted file mode 100644 index 51df5b1..0000000 --- a/pypiserver-1.3.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8b3d8df5858492c6ebb208d96deed704f5e7fe49384d7c1fb7003c8fc4691461 -size 504478 diff --git a/pypiserver-1.3.2.tar.gz b/pypiserver-1.3.2.tar.gz new file mode 100644 index 0000000..73042f9 --- /dev/null +++ b/pypiserver-1.3.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0eef1cd9c0ff3cfab0396b423914ad300c40786b90e56bf0c8910c0635b1eb5b +size 505905 diff --git a/python-pypiserver.changes b/python-pypiserver.changes index c5447d0..30697a8 100644 --- a/python-pypiserver.changes +++ b/python-pypiserver.changes @@ -1,3 +1,35 @@ +------------------------------------------------------------------- +Mon Mar 23 13:11:12 UTC 2020 - pgajdos@suse.com + +- version update to 1.3.2 + - ENH: The Dockerfile used for the official Docker images now uses Python 3.6 + rather than Python 2.7 (#284, thanks @etene!) + - ENH: The `welcome.html` page has been updated to provide more metadata + and be more HTML-standards compliant (#283, thanks @maggyero!) + - FIX: the `pypi-server -U` command no longer fails when run inside the + Docker container (thanks to @mkolb-navican for reporting in #264) + - FIX: The `remove_pkg` API action now removes any extant instances of a + package name-version combination, not just the first one found. This means + that now, for example, if a `.whl` and `.tar.gz` file exist for the + requested package name and version, both will be removed (thanks to + @esciara for reporting in #268) + - FIX: include missing `simple/` path on a URL in the example pip commands + on the `welcome.html` page (@276, thanks @maggyero!) + - DOC: more consistent and accurate documentation for pip commands provided + on the `welcome.html` page (#278, thanks @maggyero!) + - DOC: fixes to the README to make it easier for people to use pypiserver + behind an apache webserver (#289, thanks @Helveg!) + - FIX: previously, it was possible to upload packages with hashing algorithms + other than md5, but downloading them again with pip was impossible due to + incorrect truncation of the hash. This has been fixed! (Thanks + @ArneBachmann for figuring out what was wrong and reporting the issue + in #265). + - FIX: argument parsing would previously fail for the short form of + ``--help``, due an incorrect operator used during comparison (thanks to + @maggyero, #271) + - DOC: significant improvements to formatting and consistency in the README + (thanks to @maggyero, #270) + ------------------------------------------------------------------- Thu Mar 19 07:34:24 UTC 2020 - Tomáš Chvátal diff --git a/python-pypiserver.spec b/python-pypiserver.spec index 644f73b..1823b43 100644 --- a/python-pypiserver.spec +++ b/python-pypiserver.spec @@ -19,7 +19,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %bcond_without python2 Name: python-pypiserver -Version: 1.3.0 +Version: 1.3.2 Release: 0 Summary: Minimal PyPI server for uploading & downloading packages with pip/easy_install License: MIT @@ -38,6 +38,7 @@ BuildRequires: %{python_module wheel >= 0.25.0} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-passlib >= 1.6 +Requires: python-setuptools BuildArch: noarch %if %{with python2} BuildRequires: python-mock @@ -60,7 +61,10 @@ rm -f pytest.ini %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -%pytest tests -k "not (test_pipInstall_openOk or test_pipInstall_authedOk)" +# test_hash_algos: +# ERROR: No matching distribution found for a==1.0 (from centodeps) +# (see centodeps-setup.py) +%pytest tests -k "not (test_pipInstall_openOk or test_pipInstall_authedOk or test_hash_algos)" %files %{python_files} %doc README.rst