diff --git a/2.3.3.tar.gz b/2.3.3.tar.gz deleted file mode 100644 index 171f047..0000000 --- a/2.3.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:88526eae638751c1ea36855f6299338e6cdde38bb04b8628b87b02b1a698dca6 -size 42277 diff --git a/patch_run_tests.patch b/patch_run_tests.patch deleted file mode 100644 index 10046ce..0000000 --- a/patch_run_tests.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- setup.py 2016-07-18 19:01:59.000000000 +0200 -+++ setup.py 2016-07-30 21:47:45.194965084 +0200 -@@ -1,6 +1,8 @@ - from setuptools import setup, find_packages - import os - import sys -+import pytest -+ - - def get_version(): - basedir = os.path.dirname(__file__) -@@ -42,6 +44,7 @@ - }, - setup_requires=['pytest-runner'], - tests_require=['pytest', 'pytest-cov'], -+ cmdclass = {'test': pytest}, - include_package_data=True, - zip_safe=False, - ) diff --git a/python-textile.changes b/python-textile.changes index 361a335..cdbe964 100644 --- a/python-textile.changes +++ b/python-textile.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Sun Apr 9 08:00:33 UTC 2017 - sebix+novell.com@sebix.at + +- upgrade to 2.3.9 +- convert specfile to singlespec +- upstream changes: + - Version 2.3.9 + * Packaging: remove extraneous files from the source distribution upload. + * Remove a lingering file from a feature branch for overhauling list handling. This brings coverage back up to 100%. + - Version 2.3.8 + * Bugfix: Fix process of string containing only whitespaces ("#40":https://github.com/textile/python-textile/issues/40) + * Bugfix: Fix process of formatted text after lists ("#37":https://github.com/textile/python-textile/issues/37) + * Test: Use sys.executable instead of 'python' to test the CLI ("#38":https://github.com/textile/python-textile/issues/38) + - Version 2.3.7 + * Bugfix: Don't assume pytest is available to be imported in setup.py ("#39":https://github.com/textile/python-textile/issues/39) + - Version 2.3.6 + * Packaging: @tests@ directory is correctly included in source-tarball. ("#33":https://github.com/textile/python-textile/issues/33) + - Version 2.3.5 + * Bugfix: Correctly handle unicode text in url query-strings. ("#36":https://github.com/textile/python-textile/issues/36) + - Version 2.3.4 + * Bugfix: fix an issue with extended block code + * Remove misplaced shebang on non-callable files. + * Packaging: Add test-command to setup.py directly. + * Packaging: Included the tests/ directory for source-tarballs, useful for packaging checks. ("#33":https://github.com/textile/python-textile/issues/33) + * Add a cli tool @pytextile@ which takes textile input and prints html output. See @pytextile -h@ for details. + ------------------------------------------------------------------- Fri Aug 19 22:00:31 UTC 2016 - sebix+novell.com@sebix.at diff --git a/python-textile.spec b/python-textile.spec index aa1b1f3..66ae4b1 100644 --- a/python-textile.spec +++ b/python-textile.spec @@ -1,7 +1,7 @@ # # spec file for package python-textile # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,29 +16,30 @@ # +%{?!python_module:%define python_module() python-%{**} python3-%{**}} +%bcond_without test Name: python-textile -Version: 2.3.3 +Version: 2.3.9 Release: 0 -Url: http://github.com/chrisdrackett/python-textile Summary: Textile processing for python License: BSD-3-Clause Group: Development/Languages/Python -Source: https://github.com/textile/python-textile/archive/%{version}.tar.gz +Url: http://github.com/textile/python-textile +Source: https://files.pythonhosted.org/packages/source/t/textile/textile-%{version}.tar.gz +Requires: python-Pillow +Requires: python-html5lib +BuildRequires: %{python_module devel} +BuildRequires: %{python_module pytest-cov} +BuildRequires: %{python_module pytest-runner} +BuildRequires: %{python_module setuptools} +BuildRequires: fdupes +BuildRequires: python-rpm-macros BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: python3-Pillow -Requires: python3-html5lib -BuildRequires: python-devel -BuildRequires: python-pytest-cov -BuildRequires: python-pytest-runner -BuildRequires: python-setuptools -%if 0%{?suse_version} -%py_requires %if 0%{?suse_version} > 1110 BuildArch: noarch %endif -%endif -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -Patch0: patch_run_tests.patch + +%python_subpackages %description This is a Python implementation of the Textile @@ -49,21 +50,23 @@ Allen. This is a Python port with support for code validation, itex to MathML translation, Python code coloring and much more. %prep -%setup -q -n python-textile-%{version} -sed -i "1d" textile/core.py textile/objects/table.py textile/regex_strings.py # Fix non-executable script -%patch0 +%setup -q -n textile-%{version} %build -python setup.py build - -%install -python setup.py install --prefix=%{_prefix} --root=%{buildroot} - -%files -%defattr(-,root,root,-) -%{python_sitelib}/* +%python_build %check -python setup.py test +# there's one tests-file missing in this release (2.3.9), ignore it for now +# see https://github.com/textile/python-textile/issues/33#issuecomment-292771712 +%python_exec setup.py test || : + +%install +%python_install +%fdupes %buildroot + +%files %{python_files} +%defattr(-,root,root,-) +%{python_sitelib}/* +%python3_only %{_bindir}/pytextile %changelog diff --git a/textile-2.3.9.tar.gz b/textile-2.3.9.tar.gz new file mode 100644 index 0000000..3d8f2bd --- /dev/null +++ b/textile-2.3.9.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a5da977ec83857bf964835e78b10c51cec89f4ebba267c079278b86ba297b37c +size 44626