From 94a06e9b84757eada2fe561c1c5f1441944e9726c6de839bb170cc592c8cd5f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sat, 9 Mar 2019 07:47:44 +0000 Subject: [PATCH] Accepting request 682967 from home:jayvdb:coala:python3-bears - 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 - Drop pyparsing dependency as its not needed and creates circular dependency on older distributions - Reduce amount of duplicities - Update to version 17.1 * Fix utils.canonicalize_version when supplying non PEP 440 versions. - Update to version 17.0 * Drop support for python 2.6, 3.2, and 3.3. * Define minimal pyparsing version to 2.0.2 (#91). * Add epoch, release, pre, dev, and post attributes to Version and LegacyVersion (#34). * Add Version().is_devrelease and LegacyVersion().is_devrelease to make it easy to determine if a release is a development release. * Add utils.canonicalize_version to canonicalize version strings or Version instances (#121). - fix pyparsing requirement - update for single-spec - drop setuptools dependency, as this is itself now a dependency of setuptools - run tests conditionally, to minimize dependency tree - ensure egg-info is a directory (distutils would install it as file) - update to 16.8: * Fix markers that utilize ``in`` so that they render correctly. * Fix an erroneous test on Python RC releases. - update to 16.7: * Add support for the deprecated ``python_implementation`` marker which was an undocumented setuptools marker in addition to the newer markers. * Add support for the deprecated, PEP 345 environment markers in addition to the newer markers. - update to 16.5: * Fix a regression in parsing requirements with whitespaces between the comma separators. * Fix a regression in parsing requirements like ``foo (==4)``. * Fix a bug where ``packaging.requirements:Requirement`` was overly strict when matching legacy requirements. * Add a function that implements the name canonicalization from PEP 503. * Implement requirement specifiers from PEP 508. * Relicense so that packaging is available under *either* the Apache License, Version 2.0 or a 2 Clause BSD license. * Support installation of packaging when only distutils is available. * Fix ``==`` comparison when there is a prefix and a local version in play. (:issue:`41`). * Implement environment markers from PEP 508. - Adjust Requires according to requires.txt - update to 15.3: * Normalize post-release spellings for rev/r prefixes. :issue:`35` - update to 15.2: * Fix an error where the arbitary specifier (``===``) was not correctly allowing pre-releases when it was being used. * Expose the specifier and version parts through properties on the ``Specifier`` classes. * Allow iterating over the ``SpecifierSet`` to get access to all of the ``Specifier`` instances. * Allow testing if a version is contained within a specifier via the ``in`` operator. - Initial packaging OBS-URL: https://build.opensuse.org/request/show/682967 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-packaging?expand=0&rev=23 --- packaging-17.1.tar.gz | 3 --- packaging-19.0.tar.gz | 3 +++ python-packaging.changes | 21 ++++++++++++++++++++- python-packaging.spec | 22 +++++++++++----------- 4 files changed, 34 insertions(+), 15 deletions(-) delete mode 100644 packaging-17.1.tar.gz create mode 100644 packaging-19.0.tar.gz 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/