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