diff --git a/packaging-17.1.tar.gz b/packaging-17.1.tar.gz deleted file mode 100644 index d6e6716..0000000 --- a/packaging-17.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f019b770dd64e585a99714f1fd5e01c7a8f11b45635aa953fd41c689a657375b -size 49849 diff --git a/packaging-19.0.tar.gz b/packaging-19.0.tar.gz new file mode 100644 index 0000000..4695224 --- /dev/null +++ b/packaging-19.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0c98a5d0be38ed775798ece1b9727178c4469d9c3b4ada66e8e6b7849f8732af +size 48608 diff --git a/python-packaging.changes b/python-packaging.changes index ff20ce9..d3c41ca 100644 --- a/python-packaging.changes +++ b/python-packaging.changes @@ -1,7 +1,26 @@ +------------------------------------------------------------------- +Sat Mar 9 04:56:34 UTC 2019 - John Vandenberg + +- Fix check that egg-info is a directory to work with %check enabled, + and better explain how it works +- Remove unnecessary build dependency on base +- Re-add test dependency on pyparsing with minimum version defined upstream, + and replace inline comment with GitHub issue URL +- Add LICENSE.APACHE LICENSE.BSD to %license +- Update to v19.0 + * Fix string representation of PEP 508 direct URL requirements with markers. + * Better handling of file URLs + This allows for using ``file:///absolute/path``, which was previously + prevented due to the missing ``netloc`` + This allows for all file URLs that ``urlunparse`` turns back into the + original URL to be valid +- from v18.0 + * Improve error messages when invalid requirements are given + ------------------------------------------------------------------- Fri Dec 28 08:49:34 UTC 2018 - Martin Pluskal -- Drop pyparsing depndency as its not needed and creates circular +- Drop pyparsing dependency as its not needed and creates circular dependency on older distributions - Reduce amount of duplicities diff --git a/python-packaging.spec b/python-packaging.spec index d07fa9b..20dc4b3 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -1,7 +1,7 @@ # # spec file for package python-packaging # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,21 +19,17 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %bcond_with test Name: python-packaging -Version: 17.1 +Version: 19.0 Release: 0 Summary: Core utilities for Python packages License: Apache-2.0 Group: Development/Languages/Python URL: https://github.com/pypa/packaging Source: https://pypi.io/packages/source/p/packaging/packaging-%{version}.tar.gz -BuildRequires: %{python_module base} BuildRequires: %{python_module six} BuildRequires: fdupes BuildRequires: python-rpm-macros -# older versions produce: -# File "/usr/lib/python2.7/site-packages/packaging/requirements.py", line 59, in -# MARKER_EXPR = originalTextFor(MARKER_EXPR())("marker") -# TypeError: __call__() takes exactly 2 arguments (1 given) +# https://github.com/pypa/packaging/issues/91 Requires: python-pyparsing >= 2.0.2 Requires: python-six BuildArch: noarch @@ -43,6 +39,7 @@ BuildArch: noarch # (at the moment, six and pyparsing are ok) %if %{with test} BuildRequires: %{python_module pretend} +BuildRequires: %{python_module pyparsing >= 2.0.2} BuildRequires: %{python_module pytest} %endif %python_subpackages @@ -52,14 +49,18 @@ Core utilities for Python packages %prep %setup -q -n packaging-%{version} +# sdist must provide a packaging.egg-info, used below in install phase +test -d packaging.egg-info %build %python_build %install %python_install -# ensure egg-info is a directory -%{python_expand rm %{buildroot}%{$python_sitelib}/*.egg-info +# Replace distutils generated egg-info, which varies in metadata version and +# structure (single file vs directory) based on distutils, with the egg-info +# which is provided in the sdist and uses same metadata version as setuptools. +%{python_expand rm -r %{buildroot}%{$python_sitelib}/*.egg-info cp -r packaging.egg-info %{buildroot}%{$python_sitelib}/packaging-%{version}-py%{$python_version}.egg-info } %python_expand %fdupes %{buildroot}%{$python_sitelib} @@ -70,8 +71,7 @@ cp -r packaging.egg-info %{buildroot}%{$python_sitelib}/packaging-%{version}-py% %endif %files %{python_files} -%defattr(-,root,root,-) -%license LICENSE +%license LICENSE LICENSE.APACHE LICENSE.BSD %doc CHANGELOG.rst README.rst %{python_sitelib}/packaging %{python_sitelib}/packaging-%{version}-py*.egg-info/