diff --git a/fix-pylons-sphinx-theme.diff b/fix-pylons-sphinx-theme.diff index 5f45a84..4573ab6 100644 --- a/fix-pylons-sphinx-theme.diff +++ b/fix-pylons-sphinx-theme.diff @@ -1,31 +1,33 @@ -Index: b/docs/conf.py +Index: venusian-3.0.0/docs/conf.py =================================================================== ---- a/docs/conf.py -+++ b/docs/conf.py -@@ -17,38 +17,10 @@ import os +--- venusian-3.0.0.orig/docs/conf.py 2020-03-10 12:14:58.987113508 +0100 ++++ venusian-3.0.0/docs/conf.py 2020-03-10 12:21:03.213085906 +0100 +@@ -16,40 +16,10 @@ import sys + import os import datetime import pkg_resources - --# Add and use Pylons theme --if 'sphinx-build' in ' '.join(sys.argv): # protect against dumb importers -- from subprocess import call, Popen, PIPE +import pylons_sphinx_themes -- p = Popen('which git', shell=True, stdout=PIPE) +-# Add and use Pylons theme +-if "sphinx-build" in " ".join(sys.argv): # protect against dumb importers +- from subprocess import call, Popen, PIPE +- +- p = Popen("which git", shell=True, stdout=PIPE) - git = p.stdout.read().strip() - cwd = os.getcwd() -- _themes = os.path.join(cwd, '_themes') +- _themes = os.path.join(cwd, "_themes") - - if not os.path.isdir(_themes): -- call([git, 'clone', 'git://github.com/Pylons/pylons_sphinx_theme.git', -- '_themes']) +- call( +- [git, "clone", "git://github.com/Pylons/pylons_sphinx_theme.git", "_themes"] +- ) - else: - os.chdir(_themes) -- call([git, 'checkout', 'master']) -- call([git, 'pull']) +- call([git, "checkout", "master"]) +- call([git, "pull"]) - os.chdir(cwd) - -- sys.path.append(os.path.abspath('_themes')) +- sys.path.append(os.path.abspath("_themes")) - - parent = os.path.dirname(os.path.dirname(__file__)) - sys.path.append(os.path.abspath(parent)) @@ -36,10 +38,10 @@ Index: b/docs/conf.py -# Options for HTML output -# ----------------------- - --sys.path.append(os.path.abspath('_themes')) --html_theme_path = ['_themes'] - html_theme = 'pylons' +-sys.path.append(os.path.abspath("_themes")) +-html_theme_path = ["_themes"] + html_theme = "pylons" +html_theme_path = pylons_sphinx_themes.get_html_themes_path() - html_theme_options = dict(github_url='https://github.com/Pylons/venusian') + html_theme_options = dict(github_url="https://github.com/Pylons/venusian") # If your extensions are in another directory, add it here. If the diff --git a/python-venusian.changes b/python-venusian.changes index d8ffab2..67bfc74 100644 --- a/python-venusian.changes +++ b/python-venusian.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Tue Mar 10 12:18:57 UTC 2020 - pgajdos@suse.com + +- version update to 3.0.0 + 3.0.0 (2019-10-04) + - This release matches 2.0.0 other than in the version number. This fixes an + issue with Requires-Python metadata not being uploaded correctly to PyPi. + This version is only compatible with Python 3.5+ + 2.0.0 (2019-10-04) + - Drop support for Python 2.7, 3.3, and 3.4 + - Removed the usage of the ``imp`` module to squelch the warnings regarding a + deprecated modules. See https://github.com/Pylons/venusian/pull/63 and + https://github.com/Pylons/venusian/issues/57 +- modified patches + % fix-pylons-sphinx-theme.diff (refreshed) + ------------------------------------------------------------------- Mon Oct 14 14:49:37 UTC 2019 - Matej Cepl diff --git a/python-venusian.spec b/python-venusian.spec index f4f4f16..623e7ed 100644 --- a/python-venusian.spec +++ b/python-venusian.spec @@ -1,7 +1,7 @@ # # spec file for package python-venusian # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2013-2019 LISA GmbH, Bingen, Germany. # # All modifications and additions to the file contributed by third parties @@ -18,8 +18,9 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} +%define skip_python2 1 Name: python-venusian -Version: 1.2.0 +Version: 3.0.0 Release: 0 Summary: A library for deferring decorator actions License: SUSE-Repoze AND ZPL-2.1 @@ -66,14 +67,14 @@ rm -rf venusian.egg-info %build %python_build -python3 setup.py build_sphinx && rm -v build/sphinx/html/{.buildinfo,objects.inv} +PYTHONPATH=src python3 setup.py build_sphinx && rm -v build/sphinx/html/{.buildinfo,objects.inv} %install %python_install %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -%pytest venusian +%pytest %files %{python_files} %license LICENSE.txt diff --git a/venusian-1.2.0.tar.gz b/venusian-1.2.0.tar.gz deleted file mode 100644 index ffc54ad..0000000 --- a/venusian-1.2.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:64ec8285b80b110d0ae5db4280e90e31848a59db98db1aba4d7d46f48ce91e3e -size 42404 diff --git a/venusian-3.0.0.tar.gz b/venusian-3.0.0.tar.gz new file mode 100644 index 0000000..5388b18 --- /dev/null +++ b/venusian-3.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f6842b7242b1039c0c28f6feef29016e7e7dd3caaeb476a193acf737db31ee38 +size 44558