testing/py3-astor: fix packaging with setuptools>=41.4

patch from https://github.com/berkerpeksag/astor/pull/163

2 files changed, 101 insertions, 2 deletions

diff --git a/testing/py3-astor/APKBUILD b/testing/py3-astor/APKBUILD
index e15e6b026c..7feb38a8a8 100644
--- a/testing/py3-astor/APKBUILD
+++ b/testing/py3-astor/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer:
 pkgname=py3-astor
 pkgver=0.8
-pkgrel=1
+pkgrel=2
 pkgdesc="Easy manipulation of Python source via the AST"
 url="https://github.com/berkerpeksag/astor"
 arch="noarch"
@@ -12,6 +12,7 @@ makedepends="py3-setuptools"
 checkdepends="py3-nose"
 source="$pkgname-$pkgver.tar.gz::https://github.com/berkerpeksag/astor/archive/$pkgver.tar.gz
         put-2-newlines-between-func-defs.patch
+        Fix-packaging-for-setuptools-41.4.patch
         "
 builddir="$srcdir/astor-$pkgver"
 
@@ -28,4 +29,5 @@ package() {
 }
 
 sha512sums="ca787234f9a9caae37633be289d6e980e7b44507d74306ad7a30f017442d6cf423748ef35465b7b5d12bdb84ce4594af801de39882f4c11c732dba4dc65ab667  py3-astor-0.8.tar.gz
-a1b39b96a4f6b5bf2bd826af8ba88a84a1337f3464a3571b10a566aa0cdd5706f23e02398a4840bfa4b15f120595334441cb870721232047fa45d5ed5b0712df  put-2-newlines-between-func-defs.patch"
+a1b39b96a4f6b5bf2bd826af8ba88a84a1337f3464a3571b10a566aa0cdd5706f23e02398a4840bfa4b15f120595334441cb870721232047fa45d5ed5b0712df  put-2-newlines-between-func-defs.patch
+48db3a399bccfbc8a5b8d45974c8508625dc84abd08c31f9f25a222cc5a71082d76bef86210bb13f40b539370f203d55e46e73fc5f19ca2a498b396402661229  Fix-packaging-for-setuptools-41.4.patch"
diff --git a/testing/py3-astor/Fix-packaging-for-setuptools-41.4.patch b/testing/py3-astor/Fix-packaging-for-setuptools-41.4.patch
new file mode 100644
index 0000000000..63f57e407f
--- /dev/null
+++ b/testing/py3-astor/Fix-packaging-for-setuptools-41.4.patch
@@ -0,0 +1,97 @@
+From 30059dac4eb832e58ab2109db84508b294ba366d Mon Sep 17 00:00:00 2001
+From: Jonathan Ringer <jonringer117@gmail.com>
+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()