diff --git a/.gitignore b/.gitignore index e4f85a7..9bfd536 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ -/tinycss2-0.6.1.tar.gz -/tinycss2-1.0.1.tar.gz -/tinycss2-1.0.2.tar.gz +/tinycss2-*.tar.gz +/css-parsing-tests-*.tar.gz diff --git a/export-git-snapshot.sh b/export-git-snapshot.sh new file mode 100755 index 0000000..73b45f9 --- /dev/null +++ b/export-git-snapshot.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +PROJECT=css-parsing-tests +REPO=git@github.com:SimonSapin/css-parsing-tests.git + +githash=$1 +if [ -z "$githash" ]; then + echo "usage: $0 GITHASH" + exit 1 +fi + +shorthash=${githash:0:8} +outputfile="${PROJECT}"-$shorthash.tar.gz + +rm -rf "${PROJECT}"-temp +git clone "${REPO}" "${PROJECT}"-temp +cd "${PROJECT}"-temp + git archive --prefix="${PROJECT}"-$shorthash/ --format=tar ${githash} \ + | gzip --stdout > ../$outputfile +cd .. +rm -rf "${PROJECT}"-temp +echo "exported source code in $outputfile" diff --git a/python-tinycss2-disable-flake8-isort-for-pytest.patch b/python-tinycss2-disable-flake8-isort-for-pytest.patch index 6c48258..d7a114b 100644 --- a/python-tinycss2-disable-flake8-isort-for-pytest.patch +++ b/python-tinycss2-disable-flake8-isort-for-pytest.patch @@ -1,30 +1,35 @@ -diff --git a/setup.cfg b/setup.cfg -index b3b3c2d..944ca52 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -40,8 +40,6 @@ install_requires = - tests_require = - pytest-runner - pytest-cov -- pytest-flake8 -- pytest-isort - python_requires = >= 3.5 +diff --git a/pyproject.toml b/pyproject.toml +index 41535ed..30dbcd4 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -32,7 +32,7 @@ classifiers = [ - [options.package_data] -@@ -56,8 +54,6 @@ doc = - test = - pytest-runner - pytest-cov -- pytest-flake8 -- pytest-isort + [tool.flit.metadata.requires-extra] + doc = ['sphinx', 'sphinx_rtd_theme'] +-test = ['pytest', 'pytest-cov', 'pytest-flake8', 'pytest-isort', 'coverage[toml]'] ++test = ['pytest', 'pytest-cov', 'coverage[toml]'] - [bdist_wheel] - python-tag = py3 -@@ -70,7 +66,6 @@ build-dir = docs/_build - test = pytest + [tool.flit.metadata.urls] + Documentation = 'https://tinycss2.readthedocs.io/' +@@ -44,7 +44,7 @@ Donation = 'https://opencollective.com/courtbouillon' + exclude = ['.*'] - [tool:pytest] --addopts = --flake8 --isort - norecursedirs = build dist .cache .eggs .git + [tool.pytest.ini_options] +-addopts = '--isort --flake8 --cov' ++addopts = '--cov' + norecursedirs = ['tests/css-parsing-tests'] - [coverage:run] + [tool.coverage.run] +diff --git a/setup.py b/setup.py +index 8e8a09c..8901670 100644 +--- a/setup.py ++++ b/setup.py +@@ -16,8 +16,6 @@ extras_require = \ + {'doc': ['sphinx', 'sphinx_rtd_theme'], + 'test': ['pytest', + 'pytest-cov', +- 'pytest-flake8', +- 'pytest-isort', + 'coverage[toml]']} + + setup(name='tinycss2', diff --git a/python-tinycss2.spec b/python-tinycss2.spec index 8212a0e..1428cb8 100644 --- a/python-tinycss2.spec +++ b/python-tinycss2.spec @@ -6,17 +6,24 @@ Name: python-%{srcname} -Version: 1.0.2 -Release: 8%{?dist} +Version: 1.1.0 +Release: 1%{?dist} Summary: Low-level CSS parser for Python License: BSD URL: https://pypi.python.org/pypi/%{srcname}/ Source0: %pypi_source +Source1: export-git-snapshot.sh +# CSS parsing tests are governed by CC0 but not shipped in the final RPMs +# There are no releases for CSS parsing tests so the archive below was created +# with "export-git-snapshot.sh". +Source2: css-parsing-tests-c5749e5.tar.gz # Fedora does not ship pytest's flake8/isort modules Patch0: %{name}-disable-flake8-isort-for-pytest.patch BuildArch: noarch +BuildRequires: gzip +BuildRequires: tar # required to run the tests BuildRequires: %{py3_prefix}-devel BuildRequires: %{py3_prefix}-pytest @@ -44,7 +51,8 @@ specification. %prep %autosetup -n %{srcname}-%{version} - +tar xf "%{SOURCE2}" +cp -a css-parsing-tests-???????/* tests/css-parsing-tests/ %build %py3_build @@ -66,10 +74,13 @@ rm -rf %{buildroot}%{python3_sitelib}/%{srcname}/__pycache__/test.*.py? %license LICENSE %doc README.rst %{python3_sitelib}/%{srcname}/ -%{python3_sitelib}/%{srcname}-%{version}-py%{python3_version}.egg-info/ +%{python3_sitelib}/%{srcname}-%{version}-py%{python3_version}.egg-info %changelog +* Sat Nov 07 2020 Felix Schwarz - 1.1.0-1 +- update to 1.1.0 + * Wed Jul 29 2020 Fedora Release Engineering - 1.0.2-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 223f815..24f65c7 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (tinycss2-1.0.2.tar.gz) = 69bdf52898f9e704c01fe5fd11170e0efc9a6aca14646f5331fc06ebbdf941f9b6c798ded7d93636c7b810b35c659750c3ece3917c5c9cef4092e3e17b382dd1 +SHA512 (tinycss2-1.1.0.tar.gz) = 218d28511802afc89a608def03084f5d460512a41d47280b5c8bfe72314c8ab3b14c98fbb0200bea6b8509c4d6f0107410d340e2d7f1830aaa92669a2699211e +SHA512 (css-parsing-tests-c5749e5.tar.gz) = afb0248a2941bcd18904ad2021da902697385d716256019b88ded22836df0ad76e53a76cc4232546f7c3a2421785b94befb057cf99a22b423d1051e38d8cd3f6