From a931136a59516fc5936bbcd17eef90276c42d6d6cfb913ac63049e4da4ce7dc9 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 5 Apr 2017 11:35:42 +0000 Subject: [PATCH 1/4] Accepting request 485737 from devel:languages:python:singlespec - Fix python_module macro definition - update for multipython build - only distribute "pygmentize" for Python 3 OBS-URL: https://build.opensuse.org/request/show/485737 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Pygments?expand=0&rev=35 --- python-Pygments.changes | 11 +++++++++++ python-Pygments.spec | 34 +++++++++++++++++----------------- 2 files changed, 28 insertions(+), 17 deletions(-) diff --git a/python-Pygments.changes b/python-Pygments.changes index 8035a11..3b5cc14 100644 --- a/python-Pygments.changes +++ b/python-Pygments.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Apr 5 05:36:56 UTC 2017 - tbechtold@suse.com + +- Fix python_module macro definition + +------------------------------------------------------------------- +Thu Dec 8 16:45:08 UTC 2016 - jmatejek@suse.com + +- update for multipython build +- only distribute "pygmentize" for Python 3 + ------------------------------------------------------------------- Mon Oct 17 09:52:51 UTC 2016 - dmueller@suse.com diff --git a/python-Pygments.spec b/python-Pygments.spec index 1440d73..0371a82 100644 --- a/python-Pygments.spec +++ b/python-Pygments.spec @@ -1,7 +1,7 @@ # # spec file for package python-Pygments # -# 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,6 +16,7 @@ # +%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-Pygments Version: 2.1.3 Release: 0 @@ -25,17 +26,17 @@ License: BSD-2-Clause Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/P/Pygments/Pygments-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: python-devel -BuildRequires: python-nose -BuildRequires: python-setuptools +BuildRequires: %{python_module devel} +BuildRequires: %{python_module nose} +BuildRequires: %{python_module setuptools} +BuildRequires: fdupes +BuildRequires: python-rpm-macros Requires: python-setuptools Provides: python-pygments = %{version} Obsoletes: python-pygments < %{version} -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%else BuildArch: noarch -%endif + +%python_subpackages %description Pygments is a syntax highlighting package written in Python. @@ -58,25 +59,24 @@ source code. Highlights are: rm tests/examplefiles/{Sorting,test}.mod %build -python setup.py build +%python_build %install -python setup.py install --prefix=%{_prefix} --root=%{buildroot} +%python_install install -Dm0644 doc/pygmentize.1 %{buildroot}%{_mandir}/man1/pygmentize.1 +%{python_expand %fdupes %{buildroot}%{$python_sitelib}} %check -if test '%{py_ver}' = "2.6" -then - exit 0 -fi -nosetests +%{python_expand /usr/bin/nosetests-%{$python_bin_suffix}} -%files +%files %{python_files} %defattr(-,root,root,-) %doc LICENSE AUTHORS CHANGES TODO +%ifpython3 %{_bindir}/pygmentize %{_mandir}/man1/pygmentize.1* +%endif %{python_sitelib}/pygments/ -%{python_sitelib}/Pygments-%{version}-py%{py_ver}.egg-info/ +%{python_sitelib}/Pygments-%{version}-py%{python_version}.egg-info/ %changelog From 50a448bb2386172e06d605240b7ca6a556fcd2ebf0653c5aa8bcb557368c43f0 Mon Sep 17 00:00:00 2001 From: Todd R Date: Fri, 7 Apr 2017 20:20:17 +0000 Subject: [PATCH 2/4] Accepting request 486611 from home:TheBlackCat:branches:devel:languages:python Update to 2.2.0 OBS-URL: https://build.opensuse.org/request/show/486611 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Pygments?expand=0&rev=36 --- Pygments-2.1.3.tar.gz | 3 --- Pygments-2.2.0.tar.gz | 3 +++ python-Pygments.changes | 20 ++++++++++++++++++++ python-Pygments.spec | 5 +++-- 4 files changed, 26 insertions(+), 5 deletions(-) delete mode 100644 Pygments-2.1.3.tar.gz create mode 100644 Pygments-2.2.0.tar.gz diff --git a/Pygments-2.1.3.tar.gz b/Pygments-2.1.3.tar.gz deleted file mode 100644 index ba56777..0000000 --- a/Pygments-2.1.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:88e4c8a91b2af5962bfa5ea2447ec6dd357018e86e94c7d14bd8cacbc5b55d81 -size 2116434 diff --git a/Pygments-2.2.0.tar.gz b/Pygments-2.2.0.tar.gz new file mode 100644 index 0000000..8c50696 --- /dev/null +++ b/Pygments-2.2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dbae1046def0efb574852fab9e90209b23f556367b5a320c0bcb871c77c3e8cc +size 2113944 diff --git a/python-Pygments.changes b/python-Pygments.changes index 3b5cc14..74b7221 100644 --- a/python-Pygments.changes +++ b/python-Pygments.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Fri Apr 7 20:05:44 UTC 2017 - toddrme2178@gmail.com + +- Update to 2.2.0 + - Added the ability to load lexer and formatter classes directly from files + with the `-x` command line option and the `lexers.load_lexer_from_file()` + and `formatters.load_formatter_from_file()` functions. (PR#559) + - Added `lexers.find_lexer_class_by_name()`. (#1203) + - Added new token types and lexing for magic methods and variables in Python + and PHP. + - Added a new token type for string affixes and lexing for them in Python, C++ + and Postgresql lexers. + - Added a new token type for heredoc (and similar) string delimiters and + lexing for them in C++, Perl, PHP, Postgresql and Ruby lexers. + - Styles can now define colors with ANSI colors for use in the 256-color + terminal formatter. (PR#531) + - Improved the CSS lexer. (#1083, #1130) + - Added "Rainbow Dash" style. (PR#623) + - Delay loading `pkg_resources`, which takes a long while to import. (PR#690) + ------------------------------------------------------------------- Wed Apr 5 05:36:56 UTC 2017 - tbechtold@suse.com diff --git a/python-Pygments.spec b/python-Pygments.spec index 0371a82..8eb07fc 100644 --- a/python-Pygments.spec +++ b/python-Pygments.spec @@ -18,7 +18,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-Pygments -Version: 2.1.3 +Version: 2.2.0 Release: 0 Url: http://pygments.org Summary: Pygments is a syntax highlighting package written in Python @@ -67,7 +67,8 @@ install -Dm0644 doc/pygmentize.1 %{buildroot}%{_mandir}/man1/pygmentize.1 %{python_expand %fdupes %{buildroot}%{$python_sitelib}} %check -%{python_expand /usr/bin/nosetests-%{$python_bin_suffix}} +export PYTHONDEBUG=1 +%python_exec tests/run.py %files %{python_files} %defattr(-,root,root,-) From 3f162e6f450800a6b557ffceb87f6fd34940046860938a511d5022918cdee922 Mon Sep 17 00:00:00 2001 From: Todd R Date: Fri, 7 Apr 2017 20:42:56 +0000 Subject: [PATCH 3/4] Accepting request 486622 from home:TheBlackCat:branches:devel:languages:python Update source url. OBS-URL: https://build.opensuse.org/request/show/486622 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Pygments?expand=0&rev=37 --- python-Pygments.changes | 5 +++++ python-Pygments.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/python-Pygments.changes b/python-Pygments.changes index 74b7221..d5b35e2 100644 --- a/python-Pygments.changes +++ b/python-Pygments.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Apr 7 20:31:06 UTC 2017 - toddrme2178@gmail.com + +- Update source url. + ------------------------------------------------------------------- Fri Apr 7 20:05:44 UTC 2017 - toddrme2178@gmail.com diff --git a/python-Pygments.spec b/python-Pygments.spec index 8eb07fc..f6040de 100644 --- a/python-Pygments.spec +++ b/python-Pygments.spec @@ -24,7 +24,7 @@ Url: http://pygments.org Summary: Pygments is a syntax highlighting package written in Python License: BSD-2-Clause Group: Development/Languages/Python -Source: http://pypi.python.org/packages/source/P/Pygments/Pygments-%{version}.tar.gz +Source: http://files.pythonhosted.org/packages/source/P/Pygments/Pygments-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: %{python_module devel} BuildRequires: %{python_module nose} From 588ae87355ce12b1bc779a6673fcec3df7e83237c18657c765e53b255953f9e0 Mon Sep 17 00:00:00 2001 From: Todd R Date: Fri, 7 Apr 2017 21:14:11 +0000 Subject: [PATCH 4/4] Accepting request 486645 from home:TheBlackCat:branches:devel:languages:python - Use https url. OBS-URL: https://build.opensuse.org/request/show/486645 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Pygments?expand=0&rev=38 --- python-Pygments.changes | 5 +++++ python-Pygments.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/python-Pygments.changes b/python-Pygments.changes index d5b35e2..923e09f 100644 --- a/python-Pygments.changes +++ b/python-Pygments.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Apr 7 21:13:53 UTC 2017 - toddrme2178@gmail.com + +- Use https url. + ------------------------------------------------------------------- Fri Apr 7 20:31:06 UTC 2017 - toddrme2178@gmail.com diff --git a/python-Pygments.spec b/python-Pygments.spec index f6040de..d30943f 100644 --- a/python-Pygments.spec +++ b/python-Pygments.spec @@ -24,7 +24,7 @@ Url: http://pygments.org Summary: Pygments is a syntax highlighting package written in Python License: BSD-2-Clause Group: Development/Languages/Python -Source: http://files.pythonhosted.org/packages/source/P/Pygments/Pygments-%{version}.tar.gz +Source: https://files.pythonhosted.org/packages/source/P/Pygments/Pygments-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: %{python_module devel} BuildRequires: %{python_module nose}