diff --git a/.gitignore b/.gitignore index 548586c..76edc00 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /pyrsistent-0.17.3.tar.gz /v0.17.3.tar.gz /pyrsistent-0.18.0.tar.gz +/pyrsistent-0.18.1.tar.gz diff --git a/00-relax-dependencies.patch b/00-relax-dependencies.patch deleted file mode 100644 index 5fe6ea8..0000000 --- a/00-relax-dependencies.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/setup.py b/setup.py -index 931800f..49c1521 100644 ---- a/setup.py -+++ b/setup.py -@@ -70,7 +70,7 @@ setup( - 'Programming Language :: Python :: Implementation :: PyPy', - ], - test_suite='tests', -- tests_require=['pytest<5', 'hypothesis<5'], -+ tests_require=['pytest', 'hypothesis'], - scripts=[], - setup_requires=pytest_runner, - ext_modules=extensions, diff --git a/python-pyrsistent.spec b/python-pyrsistent.spec index 5608d9b..7eff3af 100644 --- a/python-pyrsistent.spec +++ b/python-pyrsistent.spec @@ -6,7 +6,7 @@ Name: python-pyrsistent Summary: Persistent/Functional/Immutable data structures -Version: 0.18.0 +Version: 0.18.1 Release: %autorelease # The entire source is MIT, except pyrsistent/_toolz.py which is BSD. @@ -14,15 +14,7 @@ License: MIT and BSD URL: https://github.com/tobgu/pyrsistent/ Source0: %{url}/archive/v%{version}/pyrsistent-%{version}.tar.gz -# Relax dependencies specified in setup.py (allow newer pytest/hypothesis) -Patch0: 00-relax-dependencies.patch -# Make pyrsistent._pmap doctests order-insensitive -# https://github.com/tobgu/pyrsistent/issues/238 -# https://bugzilla.redhat.com/show_bug.cgi?id=2040164 -Patch1: %{url}/pull/239.patch - BuildRequires: python3-devel - BuildRequires: gcc # For Sphinx documentation @@ -32,53 +24,6 @@ BuildRequires: python3-sphinx-latex BuildRequires: latexmk %endif -# We need manual BR’s since they are generally not available where -# %%pyproject_buildrequires can access them, i.e., outside requirements.txt, -# and even in requirements.txt a number of packages are not actually required -# for the RPM build. - -# ============================================================================ -# From requirements.txt: - -# hypothesis -BuildRequires: python3dist(hypothesis) - -# ---------------------------------------------------------------------------- -# We do not need these, since we are not running the memorytest* environment -# from tox.ini. -# ---------------------------------------------------------------------------- -# memory-profiler==0.57.0 -# psutil==5.7.0 - -# ---------------------------------------------------------------------------- -# We do not need this, since we are not running the benchmarks from -# performance_suites/. -# ---------------------------------------------------------------------------- -# pyperform - -# pytest -BuildRequires: python3dist(pytest) -# Sphinx -BuildRequires: python3dist(sphinx) -# sphinx-rtd-theme==0.1.5 -BuildRequires: python3dist(sphinx-rtd-theme) - -# ---------------------------------------------------------------------------- -# We do not need this, since we are not using tox to run the tests. -# ---------------------------------------------------------------------------- -# tox - -# ---------------------------------------------------------------------------- -# We do not need this, since it is implied by pyproject-rpm-macros. -# ---------------------------------------------------------------------------- -# setuptools>=0.16.1 - -# ---------------------------------------------------------------------------- -# We do not need these for the RPM build either. -# ---------------------------------------------------------------------------- -# twine>=3.2 -# pip>=20.2.3 - # ============================================================================ # From setup_requires in setup.py, when tests are to be executed: BuildRequires: python3dist(pytest-runner) @@ -115,9 +60,24 @@ BuildArch: noarch %prep %autosetup -n pyrsistent-%{version} -p1 +# Loosen exact-version pins in requirements.txt; we must tolerate newer +# versions and use what is packaged. +# +# We do not need: +# - memory-profiler or psutil, since we are not running the memorytest* +# environment from tox.ini +# - pyperform, since we are not running the benchmarks from +# performance_suites/ +# - tox, since we are not using tox to run the tests +# - twine, since it is for maintainer PyPI uploads +sed -r \ + -e 's/==/>=/' \ + -e '/\b(memory-profiler|psutil|pyperform|tox|twine)\b/d' \ + requirements.txt | tee requirements-filtered.txt + %generate_buildrequires -%pyproject_buildrequires -r +%pyproject_buildrequires -r requirements-filtered.txt %build @@ -138,9 +98,8 @@ PYTHONPATH="${PWD}" %make_build -C docs latex SPHINXOPTS='-n %{?_smp_mflags}' %check +# # See tox.ini: %pytest -# PMap order changes in Python 3.11a3, causing a doctest failure -# See tox.ini: %pytest --doctest-modules pyrsistent diff --git a/sources b/sources index 62a1ce5..c4e7809 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pyrsistent-0.18.0.tar.gz) = 6bbd6fbb5b3466aac6b9a56a55114b9c12b9b539f88102c64e704879cfe68113badcdecba2be96d17db7799d12f57c7f9ef3be755b25464aaf1d7d944eb82851 +SHA512 (pyrsistent-0.18.1.tar.gz) = ae7e8bc6d1dab52cd6a2a8447514b88f966f34c1cbd3e1aa06aec705f9ffd73e74865b10accdc62185dd9b132da4640c116eaf92c341031c9471e7422a408232