diff --git a/fix-pylons-sphinx-theme.diff b/fix-pylons-sphinx-theme.diff new file mode 100644 index 0000000..5f45a84 --- /dev/null +++ b/fix-pylons-sphinx-theme.diff @@ -0,0 +1,45 @@ +Index: b/docs/conf.py +=================================================================== +--- a/docs/conf.py ++++ b/docs/conf.py +@@ -17,38 +17,10 @@ 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) +- git = p.stdout.read().strip() +- cwd = os.getcwd() +- _themes = os.path.join(cwd, '_themes') +- +- if not os.path.isdir(_themes): +- call([git, 'clone', 'git://github.com/Pylons/pylons_sphinx_theme.git', +- '_themes']) +- else: +- os.chdir(_themes) +- call([git, 'checkout', 'master']) +- call([git, 'pull']) +- os.chdir(cwd) +- +- sys.path.append(os.path.abspath('_themes')) +- +- parent = os.path.dirname(os.path.dirname(__file__)) +- sys.path.append(os.path.abspath(parent)) +- wd = os.getcwd() +- os.chdir(parent) +- sys.path.append(parent) +- +-# Options for HTML output +-# ----------------------- +- +-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') + + # If your extensions are in another directory, add it here. If the diff --git a/pre_checkin.sh b/pre_checkin.sh deleted file mode 100644 index afc4c27..0000000 --- a/pre_checkin.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -cp python-venusian.changes python-venusian-doc.changes diff --git a/python-venusian-doc.changes b/python-venusian-doc.changes deleted file mode 100644 index 57a5072..0000000 --- a/python-venusian-doc.changes +++ /dev/null @@ -1,68 +0,0 @@ -------------------------------------------------------------------- -Fri Jul 14 07:00:53 UTC 2017 - aloisio@gmx.com - -- Update to version 1.1.0 - * Updated to using py.test instead of nosetest, and added - support for Python 3.4 -> 3.6 - * Make scanning more resilient of metaclasses that return - proxies for any attribute access. - * Fix bug where using the same venusian decorator on both a - class and its methods would cause the method decorations to be - ignored. See https://github.com/Pylons/venusian/issues/40 - * Drop support for Python 2.6. - * Drop support for Python 3.2: it is no longer supported by - current packaging / CI tools. - * Support loaders that require the module name as argument to - their get_filename() method. This fixes problems with zipped - packages on Python 3. - * Micro-optimization when ignores are used (see - https://github.com/Pylons/venusian/pull/20). - * A tox run now combines coverage between Py2 and Py3. - -- Split docs and tests into separate package to make the - latter work -- Converted to single-spec - -------------------------------------------------------------------- -Fri Feb 6 11:12:24 UTC 2015 - hpj@urpla.net - -- update to version 1.0 - - Fix an issue under PyPy > 2.0 where attached decorators may not be found. - - Drop support of Python 2.4 / 2.5 / Jython. - - Add lift and onlyliftedfrom class decorators to allow for inheritance of - venusian decorators attached to superclass methods. See the API - documentation for more information. - - Fix bug where otherwise undecorated subclass of a superclass that had - venusian decorators on it would inherit its superclass' decorations. - Venusian decorators should have never been inherited implicitly. See - https://github.com/Pylons/venusian/issues/11#issuecomment-4977352 - -------------------------------------------------------------------- -Wed Dec 18 13:53:45 UTC 2013 - cfarrell@suse.com - -- license update: SUSE-Repoze - See LICENSE - -------------------------------------------------------------------- -Tue Dec 10 13:08:49 UTC 2013 - p.drouand@gmail.com - -- Use tarball from pypi.python.org/ as source - -------------------------------------------------------------------- -Tue Dec 10 13:01:51 UTC 2013 - p.drouand@gmail.com - -- Change license to get it SPDX compliant; - In general, python packages are licensed under BSD derived; the - most closed license is BSD-2-Clause - -------------------------------------------------------------------- -Mon Jul 29 13:40:30 UTC 2013 - speilicke@suse.com - -- Simplify macro usage - -------------------------------------------------------------------- -Sun Jul 28 20:12:18 UTC 2013 - hpj@urpla.net - -- version 1.0a8: initial release - - diff --git a/python-venusian-doc.spec b/python-venusian-doc.spec deleted file mode 100644 index 5029633..0000000 --- a/python-venusian-doc.spec +++ /dev/null @@ -1,58 +0,0 @@ -# -# spec file for package python-venusian-doc -# -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. -# Copyright (c) 2015 LISA GmbH, Bingen, Germany. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via https://bugs.opensuse.org/ -# - - -%{?!python_module:%define python_module() python-%{**} python3-%{**}} -Name: python-venusian-doc -Version: 1.1.0 -Release: 0 -Summary: Documentation for python-venusian -License: SUSE-Repoze -Group: Development/Languages/Python -URL: https://github.com/Pylons/venusian -Source: https://files.pythonhosted.org/packages/source/v/venusian/venusian-%{version}.tar.gz -BuildRequires: %{python_module setuptools} -BuildRequires: %{python_module venusian = %{version}} -BuildRequires: python-rpm-macros -BuildArch: noarch -# SECTION documentation requirements -BuildRequires: python3-Sphinx -BuildRequires: python3-pylons-sphinx-themes -BuildRequires: python3-repoze.sphinx.autointerface -# /SECTION -%python_subpackages - -%description -This package contains documentation files for python-venusian. - -%prep -%setup -q -n venusian-%{version} - -%build -ln -s %{python3_sitelib}/pylons_sphinx_themes docs/_themes -%python_build -python3 setup.py build_sphinx && rm -v build/sphinx/html/{.buildinfo,objects.inv} - -%install -%python_install -%python_expand rm -rfv %{buildroot}%{$python_sitelib}/venusian* - -%files %{python_files} -%doc build/sphinx/html/ - -%changelog diff --git a/python-venusian.changes b/python-venusian.changes index af63a02..17b70ce 100644 --- a/python-venusian.changes +++ b/python-venusian.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Feb 7 16:26:44 UTC 2019 - Hans-Peter Jansen + +- Update to version 1.2.0 (2019-01-08) + + Add support for Python 3.7. + + Drop support for Python 3.3. +- Combine package-doc and package spec +- add fix-pylons-sphinx-theme.diff patch + to generate docs with the pylons-sphinx-themes package + ------------------------------------------------------------------- Thu Jun 28 17:17:31 UTC 2018 - mcepl@suse.com diff --git a/python-venusian.spec b/python-venusian.spec index fdb543d..05d1c9a 100644 --- a/python-venusian.spec +++ b/python-venusian.spec @@ -1,8 +1,8 @@ # # spec file for package python-venusian # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. -# Copyright (c) 2015 LISA GmbH, Bingen, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2013-2019 LISA GmbH, Bingen, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,13 +19,14 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-venusian -Version: 1.1.0 +Version: 1.2.0 Release: 0 Summary: A library for deferring decorator actions License: SUSE-Repoze AND ZPL-2.1 Group: Development/Languages/Python URL: https://github.com/Pylons/venusian Source: https://files.pythonhosted.org/packages/source/v/venusian/venusian-%{version}.tar.gz +Patch: fix-pylons-sphinx-theme.diff BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -37,6 +38,10 @@ BuildRequires: %{python_module nose} BuildRequires: %{python_module pytest-cov} BuildRequires: %{python_module pytest} # /SECTION +# SECTION documentation requirements +BuildRequires: python3-Sphinx +BuildRequires: python3-pylons-sphinx-themes +# /SECTION %python_subpackages %description @@ -48,12 +53,22 @@ usually taken by the decorator until a separate "scan" phase. See the "docs" directory of the package or the online documentation at http://docs.pylonsproject.org/projects/venusian/dev/. +%package doc +Summary: Documentation for %{name} +Group: Documentation/HTML +Requires: %{name} = %{version} + +%description doc +This package contains documentation files for %{name}. + %prep %setup -q -n venusian-%{version} +%patch -p1 rm -rf venusian.egg-info %build %python_build +python3 setup.py build_sphinx && rm -v build/sphinx/html/{.buildinfo,objects.inv} %install %python_install @@ -68,4 +83,8 @@ rm -rf venusian.egg-info %{python_sitelib}/venusian %{python_sitelib}/venusian-%{version}-py%{python_version}.egg-info +%files %{python_files doc} +%license LICENSE.txt +%doc build/sphinx/html/ + %changelog diff --git a/venusian-1.1.0.tar.gz b/venusian-1.1.0.tar.gz deleted file mode 100644 index 634ce96..0000000 --- a/venusian-1.1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9902e492c71a89a241a18b2f9950bea7e41d025cc8f3af1ea8d8201346f8577d -size 44674 diff --git a/venusian-1.2.0.tar.gz b/venusian-1.2.0.tar.gz new file mode 100644 index 0000000..ffc54ad --- /dev/null +++ b/venusian-1.2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:64ec8285b80b110d0ae5db4280e90e31848a59db98db1aba4d7d46f48ce91e3e +size 42404