From 4ed74a779a9107f96ec498589a9f52ff5f55ad5b Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Fri, 23 Jun 2017 13:24:54 -0700 Subject: [PATCH 1/2] Move cherry_picker to flit --- cherry_picker/MANIFEST.in | 3 --- cherry_picker/cherry_picker/__init__.py | 2 ++ cherry_picker/flit.ini | 15 +++++++++++ cherry_picker/setup.cfg | 0 cherry_picker/setup.py | 36 ------------------------- 5 files changed, 17 insertions(+), 39 deletions(-) delete mode 100644 cherry_picker/MANIFEST.in create mode 100644 cherry_picker/flit.ini delete mode 100644 cherry_picker/setup.cfg delete mode 100755 cherry_picker/setup.py diff --git a/cherry_picker/MANIFEST.in b/cherry_picker/MANIFEST.in deleted file mode 100644 index 65b3848..0000000 --- a/cherry_picker/MANIFEST.in +++ /dev/null @@ -1,3 +0,0 @@ -# Include the readme and requirements files -include readme.rst -include requirements.txt diff --git a/cherry_picker/cherry_picker/__init__.py b/cherry_picker/cherry_picker/__init__.py index e69de29..e535776 100644 --- a/cherry_picker/cherry_picker/__init__.py +++ b/cherry_picker/cherry_picker/__init__.py @@ -0,0 +1,2 @@ +"""Backport CPython changes from master to maintenance branches.""" +__version__ = '0.0.3.dev1' diff --git a/cherry_picker/flit.ini b/cherry_picker/flit.ini new file mode 100644 index 0000000..b40e7e8 --- /dev/null +++ b/cherry_picker/flit.ini @@ -0,0 +1,15 @@ +[metadata] +module = cherry_picker +author = Mariatta Wijaya +author-email = mariatta.wijaya@gmail.com +home-page = https://github.com/python/core-workflow/tree/master/cherry_picker +requires = click~=6.7 +dev-requires = pytest~=3.0.7 +description-file = readme.rst +classifiers = Programming Language :: Python :: 3.6 + Intended Audience :: Developers + License :: OSI Approved :: Apache Software License +requires-python = ~=3.6 + +[scripts] +cherry_picker = cherry_picker.cherry_picker:cherry_pick_cli diff --git a/cherry_picker/setup.cfg b/cherry_picker/setup.cfg deleted file mode 100644 index e69de29..0000000 diff --git a/cherry_picker/setup.py b/cherry_picker/setup.py deleted file mode 100755 index 88e45c2..0000000 --- a/cherry_picker/setup.py +++ /dev/null @@ -1,36 +0,0 @@ -from setuptools import setup - - -with open('readme.rst') as f: - long_description = f.read() - - -with open('requirements.txt') as f: - requirements = [l.strip() for l in f.read().split('\n')] - - -setup( - name='cherry_picker', - description='Backport CPython changes from master to maintenance branches', - long_description=long_description, - license='Apache', - url='https://github.com/python/core-workflow', - author='Mariatta Wijaya', - author_email='mariatta.wijaya@gmail.com', - maintainer='Python Core Developers', - maintainer_email='core-workflow@mail.python.org', - version='0.0.2.post2', - packages=[ - 'cherry_picker', - ], - entry_points={ - 'console_scripts': [ - 'cherry_picker = cherry_picker.cherry_picker:cherry_pick_cli', - ], - }, - classifiers=[ - 'Programming Language :: Python :: 3.6', - 'Intended Audience :: Developers', - ], - install_requires=requirements, -) From a48e497f3e07784fa6b112a26797129a35c6cac6 Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Fri, 23 Jun 2017 14:01:50 -0700 Subject: [PATCH 2/2] Just assume cherry_picker will work with Python 4 --- cherry_picker/flit.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cherry_picker/flit.ini b/cherry_picker/flit.ini index b40e7e8..8049d2a 100644 --- a/cherry_picker/flit.ini +++ b/cherry_picker/flit.ini @@ -9,7 +9,7 @@ description-file = readme.rst classifiers = Programming Language :: Python :: 3.6 Intended Audience :: Developers License :: OSI Approved :: Apache Software License -requires-python = ~=3.6 +requires-python = >=3.6 [scripts] cherry_picker = cherry_picker.cherry_picker:cherry_pick_cli