diff --git a/python-translationstring.changes b/python-translationstring.changes index 4534edf..426a66c 100644 --- a/python-translationstring.changes +++ b/python-translationstring.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Jul 23 13:22:08 UTC 2020 - Marketa Calabkova + +- update to 1.4 + * Drop support for Python 2.6, 3.2 and 3. + * Update license classifiers +- drop use_pylons_theme.patch + ------------------------------------------------------------------- Thu Feb 1 16:50:50 UTC 2018 - toddrme2178@gmail.com diff --git a/python-translationstring.spec b/python-translationstring.spec index b052592..4bc205b 100644 --- a/python-translationstring.spec +++ b/python-translationstring.spec @@ -1,7 +1,7 @@ # # spec file for package python-translationstring # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2015 LISA GmbH, Bingen, Germany. # # All modifications and additions to the file contributed by third parties @@ -13,30 +13,28 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-translationstring -Version: 1.3 +Version: 1.4 Release: 0 Summary: Utility library for i18n relied on by various Repoze and Pyramid packages License: SUSE-Repoze Group: Development/Languages/Python -Url: https://github.com/Pylons/translationstring +URL: https://github.com/Pylons/translationstring Source: https://files.pythonhosted.org/packages/source/t/translationstring/translationstring-%{version}.tar.gz -# PATCH-FIX-UPSTREAM use_pylons_theme.patch -- Use pylons_sphinx_theme from external package -Patch0: use_pylons_theme.patch BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: git BuildRequires: python-rpm-macros +BuildArch: noarch # SECTION documentation requirements BuildRequires: python3-Sphinx BuildRequires: python3-pylons-sphinx-themes # /SECTION -BuildArch: noarch %python_subpackages %description @@ -52,7 +50,6 @@ work best when provided with an instance of the babel.support.Translations class %package -n %{name}-doc Summary: Documentation files for %{name} Group: Development/Languages/Python -Requires: %{name} = %{version} Provides: %{python_module translationstring-doc = %{version}} %description -n %{name}-doc @@ -60,7 +57,6 @@ This package contains documentation files for %{name}. %prep %setup -q -n translationstring-%{version} -%patch0 -p1 # drop build date from doc to fix build-compare sed -i "s/\(html_last_updated_fmt = \).*/\\1None/" docs/conf.py rm -rf translationstring.egg-info @@ -80,12 +76,11 @@ popd %python_exec setup.py test %files %{python_files} -%defattr(-,root,root,-) -%doc CONTRIBUTORS.txt COPYRIGHT.txt LICENSE.txt README.rst +%license LICENSE.txt +%doc CONTRIBUTORS.txt COPYRIGHT.txt README.rst %{python_sitelib}/* %files -n %{name}-doc -%defattr(-,root,root,-) %doc docs/_build/html %changelog diff --git a/translationstring-1.3.tar.gz b/translationstring-1.3.tar.gz deleted file mode 100644 index 7a4c916..0000000 --- a/translationstring-1.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4ee44cfa58c52ade8910ea0ebc3d2d84bdcad9fa0422405b1801ec9b9a65b72d -size 29259 diff --git a/translationstring-1.4.tar.gz b/translationstring-1.4.tar.gz new file mode 100644 index 0000000..3662a8d --- /dev/null +++ b/translationstring-1.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bf947538d76e69ba12ab17283b10355a9ecfbc078e6123443f43f2107f6376f3 +size 24199 diff --git a/use_pylons_theme.patch b/use_pylons_theme.patch deleted file mode 100644 index 22c5a69..0000000 --- a/use_pylons_theme.patch +++ /dev/null @@ -1,182 +0,0 @@ -diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt -index b47a26b..fe247b0 100644 ---- a/CONTRIBUTORS.txt -+++ b/CONTRIBUTORS.txt -@@ -104,3 +104,4 @@ Contributors - - - Chris McDonough, 2011/02/16 - - Wichert Akkerman, 2012/02/02 -+- Steve Piercy, 2015/05/05 -diff --git a/docs/Makefile b/docs/Makefile -index c0694bb..e11be66 100644 ---- a/docs/Makefile -+++ b/docs/Makefile -@@ -25,7 +25,7 @@ help: - clean: - -rm -rf _build/* - --html: _themes -+html: - mkdir -p _build/html _build/doctrees - $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) _build/html - @echo -@@ -47,7 +47,7 @@ pickle: - - web: pickle - --htmlhelp: _themes -+htmlhelp: - mkdir -p _build/htmlhelp _build/doctrees - $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) _build/htmlhelp - @echo -@@ -83,6 +83,3 @@ epub: - $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) _build/epub - @echo - @echo "Build finished. The epub file is in _build/epub." -- --_themes: -- cd ..; git submodule update --init; cd docs -diff --git a/docs/conf.py b/docs/conf.py -index 1598f3a..65546ff 100644 ---- a/docs/conf.py -+++ b/docs/conf.py -@@ -13,23 +13,8 @@ - # out serve to show the default value. - - import sys, os -- --# If your extensions are in another directory, add it here. If the --# directory is relative to the documentation root, use os.path.abspath to --# make it absolute, like shown here. --#sys.path.append(os.path.abspath('some/directory')) -- --parent = os.path.dirname(os.path.dirname(__file__)) --sys.path.append(os.path.abspath(parent)) --wd = os.getcwd() --os.chdir(parent) --os.system('%s setup.py test -q' % sys.executable) --os.chdir(wd) -- --for item in os.listdir(parent): -- if item.endswith('.egg'): -- sys.path.append(os.path.join(parent, item)) -- -+import pkg_resources -+import pylons_sphinx_themes - - # General configuration - # --------------------- -@@ -56,7 +41,7 @@ - # other places throughout the built documents. - # - # The short X.Y version. --version = '0.4' -+version = pkg_resources.get_distribution('translationstring').version - # The full version, including alpha/beta/rc tags. - release = version - -@@ -82,7 +67,7 @@ - - # If true, the current module name will be prepended to all description - # unit titles (such as .. function::). --#add_module_names = True -+add_module_names = False - - # If true, sectionauthor and moduleauthor directives will be shown in the - # output. They are ignored by default. -@@ -94,11 +79,12 @@ - - # Options for HTML output - # ----------------------- -- --sys.path.append(os.path.abspath('_themes')) --html_theme_path = ['_themes'] -+# sys.path.append(os.path.abspath('_themes')) - html_theme = 'pyramid' --html_theme_options = dict(github_url='https://github.com/Pylons/translationstring') -+html_theme_path = pylons_sphinx_themes.get_html_themes_path() -+html_theme_options = dict( -+ github_url='https://github.com/Pylons/translationstring', -+ ) - - - # The style sheet to use for HTML and HTML Help pages. A file of that name -@@ -116,7 +102,7 @@ - - # The name of an image file (within the static path) to place at the top of - # the sidebar. --html_logo = '.static/logo_hi.gif' -+#html_logo = '.static/logo_hi.gif' - - # The name of an image file (within the static path) to use as favicon of - # the docs. This file should be a Windows icon file (.ico) being 16x16 or -@@ -135,7 +121,7 @@ - - # If true, SmartyPants will be used to convert quotes and dashes to - # typographically correct entities. --#html_use_smartypants = True -+html_use_smartypants = False - - # Custom sidebar templates, maps document names to template names. - #html_sidebars = {} -@@ -188,7 +174,7 @@ - - # The name of an image file (relative to this directory) to place at the - # top of the title page. --latex_logo = '.static/logo_hi.gif' -+#latex_logo = '.static/logo_hi.gif' - - # For "manual" documents, if this is true, then toplevel headings are - # parts, not chapters. -diff --git a/setup.py b/setup.py -index e30228f..f14a3d4 100644 ---- a/setup.py -+++ b/setup.py -@@ -12,6 +12,12 @@ - README = '' - CHANGES = '' - -+docs_extras = [ -+ 'Sphinx', -+ 'docutils', -+ 'pylons-sphinx-themes >= 0.3', -+] -+ - setup(name='translationstring', - version='1.3', - description=('Utility library for i18n relied on by various Repoze ' -@@ -42,5 +48,8 @@ - include_package_data=True, - zip_safe=False, - test_suite="translationstring", -+ extras_require={ -+ 'docs': docs_extras, -+ }, - ) - -diff --git a/tox.ini b/tox.ini -index 657c398..fe6badb 100644 ---- a/tox.ini -+++ b/tox.ini -@@ -1,6 +1,6 @@ - [tox] - envlist = -- py26,py27,py32,jython,pypy,cover -+ py26,py27,py32,jython,pypy,cover,docs - - [testenv] - commands = -@@ -19,6 +19,13 @@ deps = - coverage==3.4 - nosexcover - -+[testenv:docs] -+basepython = -+ python2.7 -+commands = -+ pip install translationstring[docs] -+ sphinx-build -b html -d docs/_build/doctrees docs docs/_build/html -+ - # we separate coverage into its own testenv because a) "last run wins" wrt - # cobertura jenkins reporting and b) pypy and jython can't handle any - # combination of versions of coverage and nosexcover that i can find.