From ba8055c9124837a38b2e96251291dac0d4d51630e1a57e8465f2ace615edc497 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 17 Jan 2020 18:10:04 +0000 Subject: [PATCH] Accepting request 765263 from home:mcalabkova:branches:devel:languages:python - update to 0.8.1 * Create sdist before making a test release too * remove expr_text handler from fstrings - Drop obsolete python38.patch and setuptools-gt-41_1.patch OBS-URL: https://build.opensuse.org/request/show/765263 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-astor?expand=0&rev=11 --- astor-0.8.1.tar.gz | 3 ++ astor-0.8.tar.gz | 3 -- python-astor.changes | 8 ++++ python-astor.spec | 8 +--- python38.patch | 25 ----------- setuptools-gt-41_1.patch | 97 ---------------------------------------- 6 files changed, 13 insertions(+), 131 deletions(-) create mode 100644 astor-0.8.1.tar.gz delete mode 100644 astor-0.8.tar.gz delete mode 100644 python38.patch delete mode 100644 setuptools-gt-41_1.patch diff --git a/astor-0.8.1.tar.gz b/astor-0.8.1.tar.gz new file mode 100644 index 0000000..9a4fbfc --- /dev/null +++ b/astor-0.8.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eee1edbf7d58dbc01f0e42fa1a6a1e15470335ec6b82f090dfcf18c10d27c89c +size 41340 diff --git a/astor-0.8.tar.gz b/astor-0.8.tar.gz deleted file mode 100644 index 9e38661..0000000 --- a/astor-0.8.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e1161080b18ac49498e9a2fe6d4914072b06312fa4d373c980f61a907d86a00e -size 41000 diff --git a/python-astor.changes b/python-astor.changes index d17dab7..590fd70 100644 --- a/python-astor.changes +++ b/python-astor.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Jan 17 12:59:09 UTC 2020 - Marketa Calabkova + +- update to 0.8.1 + * Create sdist before making a test release too + * remove expr_text handler from fstrings +- Drop obsolete python38.patch and setuptools-gt-41_1.patch + ------------------------------------------------------------------- Thu Nov 14 14:30:21 CET 2019 - Matej Cepl diff --git a/python-astor.spec b/python-astor.spec index 4f41241..bec24bd 100644 --- a/python-astor.spec +++ b/python-astor.spec @@ -1,7 +1,7 @@ # # spec file for package python-astor # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,17 +18,13 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-astor -Version: 0.8 +Version: 0.8.1 Release: 0 Summary: Read/rewrite/write Python ASTs License: BSD-3-Clause Group: Development/Languages/Python URL: https://github.com/berkerpeksag/astor Source: https://github.com/berkerpeksag/astor/archive/%{version}.tar.gz#/astor-%{version}.tar.gz -Patch0: python38.patch -# PATCH-FIX-UPSTREAM setuptools-gt-41_1.patch gh#berkerpeksag/astor#163 mcepl@suse.com -# Remove weird acrobatics in setup.py and prefer proper use of setup.cfg. -Patch1: setuptools-gt-41_1.patch BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros diff --git a/python38.patch b/python38.patch deleted file mode 100644 index 53b4311..0000000 --- a/python38.patch +++ /dev/null @@ -1,25 +0,0 @@ -From ab682f6ded42f0a779986a31d8bc033e4d8ae909 Mon Sep 17 00:00:00 2001 -From: isidentical -Date: Mon, 2 Sep 2019 20:07:41 +0300 -Subject: [PATCH] put 2 newlines between func defs, resolves #156 - ---- - tests/test_code_gen.py | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/tests/test_code_gen.py b/tests/test_code_gen.py -index 3cb7e64..c4935ae 100644 ---- a/tests/test_code_gen.py -+++ b/tests/test_code_gen.py -@@ -171,9 +171,11 @@ def test_positional_only_arguments(self): - def test(a, b, /, c, *, d, **kwargs): - pass - -+ - def test(a=3, b=4, /, c=7): - pass - -+ - def test(a, b=4, /, c=8, d=9): - pass - """ diff --git a/setuptools-gt-41_1.patch b/setuptools-gt-41_1.patch deleted file mode 100644 index c4bef43..0000000 --- a/setuptools-gt-41_1.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 30059dac4eb832e58ab2109db84508b294ba366d Mon Sep 17 00:00:00 2001 -From: Jonathan Ringer -Date: Thu, 17 Oct 2019 16:54:16 -0700 -Subject: [PATCH] Fix packaging for setuptools>=41.4 - ---- - MANIFEST.in | 1 + - astor/VERSION | 1 + - astor/__init__.py | 5 ++++- - setup.cfg | 3 ++- - setup.py | 16 +--------------- - 5 files changed, 9 insertions(+), 17 deletions(-) - create mode 100644 astor/VERSION - -diff --git a/MANIFEST.in b/MANIFEST.in -index b12a6fe..81e72d5 100644 ---- a/MANIFEST.in -+++ b/MANIFEST.in -@@ -1,3 +1,4 @@ - include README.rst AUTHORS LICENSE CHANGES - include setuputils.py -+include astor/VERSION - recursive-include tests *.py -diff --git a/astor/VERSION b/astor/VERSION -new file mode 100644 -index 0000000..a3df0a6 ---- /dev/null -+++ b/astor/VERSION -@@ -0,0 +1 @@ -+0.8.0 -diff --git a/astor/__init__.py b/astor/__init__.py -index 3b02983..bdedaef 100644 ---- a/astor/__init__.py -+++ b/astor/__init__.py -@@ -9,6 +9,7 @@ - - """ - -+import os - import warnings - - from .code_gen import SourceGenerator, to_source # NOQA -@@ -19,7 +20,9 @@ - from .op_util import symbol_data # NOQA - from .tree_walk import TreeWalk # NOQA - --__version__ = '0.8.0' -+ROOT = os.path.dirname(__file__) -+with open(os.path.join(ROOT, 'VERSION')) as version_file: -+ __version__ = version_file.read().strip() - - parse_file = code_to_ast.parse_file - -diff --git a/setup.cfg b/setup.cfg -index 1baf6fc..a43634f 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -2,6 +2,7 @@ - name = astor - description = Read/rewrite/write Python ASTs - long_description = file:README.rst -+version = file: astor/VERSION - author = Patrick Maupin - author_email = pmaupin@gmail.com - platforms = Independent -@@ -40,7 +41,7 @@ test_suite = nose.collector - [options.packages.find] - exclude = tests - --[wheel] -+[bdist_wheel] - universal = 1 - - [build-system] -diff --git a/setup.py b/setup.py -index 4a111b5..6068493 100644 ---- a/setup.py -+++ b/setup.py -@@ -1,17 +1,3 @@ --import os --import sys -- - from setuptools import setup --from setuptools.config import read_configuration -- --from setuputils import find_version -- -- --def here(*paths): -- return os.path.join(os.path.dirname(__file__), *paths) -- --config = read_configuration(here('setup.cfg')) --config['metadata']['version'] = find_version(here('astor', '__init__.py')) --config['options'].update(config['metadata']) - --setup(**config['options']) -+setup()