diff --git a/compat-patcher-core-1.0.tar.gz b/compat-patcher-core-1.0.tar.gz deleted file mode 100644 index 58766ec..0000000 --- a/compat-patcher-core-1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:88cf7a6b385cc7f853930ed25e44106bb672f13b4bbc9a80f0efa5dc9f5e816f -size 42550 diff --git a/compat-patcher-core-1.2.tar.gz b/compat-patcher-core-1.2.tar.gz new file mode 100644 index 0000000..a3d8fea --- /dev/null +++ b/compat-patcher-core-1.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9544ec929439fd16438b4f721ed30c7bb0345d0299152de0fef20119c197503b +size 45474 diff --git a/python-compat-patcher-core.changes b/python-compat-patcher-core.changes index 74ee33f..47437c8 100644 --- a/python-compat-patcher-core.changes +++ b/python-compat-patcher-core.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed Jan 20 07:28:02 UTC 2021 - John Vandenberg + +- Enable test_cookiecutter_recipe +- Update to v1.2 + * Fix import-proxifier to remove AssertionError on module + `__name__` when interfering with other custom + importers (ex. when importing "six.moves.urllib.parse") +- from v1.1 + * Support for Pytest 6 + * Slight logging improvements + ------------------------------------------------------------------- Sat May 9 11:32:30 PM UTC 2020 - John Vandenberg diff --git a/python-compat-patcher-core.spec b/python-compat-patcher-core.spec index 3ae3686..122375f 100644 --- a/python-compat-patcher-core.spec +++ b/python-compat-patcher-core.spec @@ -1,7 +1,7 @@ # # spec file for package python-compat-patcher-core # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-compat-patcher-core -Version: 1.0 +Version: 1.2 Release: 0 Summary: Python patcher system License: MIT @@ -31,11 +31,14 @@ BuildRequires: dos2unix BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-six +Suggests: cookiecutter > 1.6.0 BuildArch: noarch # SECTION test requirements BuildRequires: %{python_module docutils} -BuildRequires: %{python_module pytest} +BuildRequires: %{python_module pytest-cov} +BuildRequires: %{python_module pytest-runner} BuildRequires: %{python_module six} +BuildRequires: python3-pytest-cookies # /SECTION %python_subpackages @@ -46,8 +49,6 @@ Python patcher system to allow easy and lasting API compatibility. %setup -q -n compat-patcher-core-%{version} sed -i 's/python setup/python3 setup/' tests/*.py dos2unix CHANGELOG -# Depends on pytest-cookies, and the recipe isnt part of the core package -rm tests/test_cookiecutter_recipe.py rm pytest.ini %build @@ -58,7 +59,15 @@ rm pytest.ini %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -%pytest tests +# Cookiecutter is only available as python3, which is not 3.6 on Tumbleweed +%{python_expand export PYTHONPATH=%{buildroot}%{$python_sitelib} +if [ "$python" = "python3.6" -o "$python" = "python2" ]; then + ignore="tests/test_cookiecutter_recipe.py" +else + ignore="" +fi +$python -m pytest tests ${ignore:+ --ignore "$ignore"} +} %files %{python_files} %doc AUTHORS CHANGELOG README.rst