From 106c94d08688644a619f3231c924cd383054255d Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Mon, 13 Jan 2020 09:09:37 -0800 Subject: python3-astor: 0.8 -> 0.8.1 f820f3ff7ad8818475b6e107e63aa9a54252d2a9.patch Removed since it is included in 0.8.1. Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../f820f3ff7ad8818475b6e107e63aa9a54252d2a9.patch | 103 --------------------- .../recipes-devtools/python/python3-astor_0.8.1.bb | 14 +++ .../recipes-devtools/python/python3-astor_0.8.bb | 16 ---- 3 files changed, 14 insertions(+), 119 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python3-astor/f820f3ff7ad8818475b6e107e63aa9a54252d2a9.patch create mode 100644 meta-python/recipes-devtools/python/python3-astor_0.8.1.bb delete mode 100644 meta-python/recipes-devtools/python/python3-astor_0.8.bb diff --git a/meta-python/recipes-devtools/python/python3-astor/f820f3ff7ad8818475b6e107e63aa9a54252d2a9.patch b/meta-python/recipes-devtools/python/python3-astor/f820f3ff7ad8818475b6e107e63aa9a54252d2a9.patch deleted file mode 100644 index 6d71be9927..0000000000 --- a/meta-python/recipes-devtools/python/python3-astor/f820f3ff7ad8818475b6e107e63aa9a54252d2a9.patch +++ /dev/null @@ -1,103 +0,0 @@ -From f820f3ff7ad8818475b6e107e63aa9a54252d2a9 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 - -Upstream-Status: Pending - -Signed-off-by: Hongxu Jia ---- - 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..8dfcdb1 100644 ---- a/astor/__init__.py -+++ b/astor/__init__.py -@@ -9,6 +9,7 @@ Copyright 2013 (c) Berker Peksag - - """ - -+import os - import warnings - - from .code_gen import SourceGenerator, to_source # NOQA -@@ -19,7 +20,9 @@ from .op_util import get_op_symbol, get_op_precedence # NOQA - 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() --- -2.21.0 - diff --git a/meta-python/recipes-devtools/python/python3-astor_0.8.1.bb b/meta-python/recipes-devtools/python/python3-astor_0.8.1.bb new file mode 100644 index 0000000000..125a0236ec --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-astor_0.8.1.bb @@ -0,0 +1,14 @@ +SUMMARY = "Easy manipulation of Python source via the AST." +HOMEPAGE = "https://github.com/berkerpeksag/astor" +SECTION = "devel/python" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=561205fdabc3ec52cae2d30815b8ade7" + +SRC_URI = "git://github.com/berkerpeksag/astor.git " +SRCREV ?= "c7553c79f9222e20783fe9bd8a553f932e918072" + +inherit setuptools3 + +S = "${WORKDIR}/git" + +BBCLASSEXTEND = "native" diff --git a/meta-python/recipes-devtools/python/python3-astor_0.8.bb b/meta-python/recipes-devtools/python/python3-astor_0.8.bb deleted file mode 100644 index 17cc540f00..0000000000 --- a/meta-python/recipes-devtools/python/python3-astor_0.8.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "Easy manipulation of Python source via the AST." -HOMEPAGE = "https://github.com/berkerpeksag/astor" -SECTION = "devel/python" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=561205fdabc3ec52cae2d30815b8ade7" - -SRC_URI = "git://github.com/berkerpeksag/astor.git \ - file://f820f3ff7ad8818475b6e107e63aa9a54252d2a9.patch \ - " -SRCREV ?= "3a7607e31f0c17e747ded5cfe0b582d99f7caecf" - -inherit setuptools3 - -S = "${WORKDIR}/git" - -BBCLASSEXTEND = "native" -- cgit v1.2.3-54-g00ecf