From c4dad1defc08b2c613a60e16db4f1d39303a6e4a Mon Sep 17 00:00:00 2001 From: Benedek Racz Date: Tue, 30 Apr 2019 15:57:27 +0200 Subject: [PATCH 1/2] [ADD] coherent versions using pbr --- .gitignore | 4 +- setup.cfg | 25 +++++++++ setup.py | 146 ++--------------------------------------------------- wexpect.py | 6 ++- 4 files changed, 38 insertions(+), 143 deletions(-) create mode 100644 setup.cfg diff --git a/.gitignore b/.gitignore index 53cfa25..d457928 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,9 @@ __pycache__/ # C extensions *.so -setup.cfg +.eggs/ +AUTHORS +ChangeLog # Distribution / packaging .Python diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..45dd362 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,25 @@ +[metadata] +name = wexpect +author = Noah Spurrier, Richard Holden, Marco Molteni, Kimberley Burchett, Robert Stone, Hartmut Goebel, Chad Schroeder, Erick Tryzelaar, Dave Kirby, Ids vander Molen, George Todd, Noel Taylor, Nicolas D. Cesar, Alexander Gattin, Geoffrey Marshall, Francisco Lourenco, Glen Mabey, Karthik Gurusamy, Fernando Perez, Corey Minyard, Jon Cohen, Guillaume Chazarain, Andrew Ryan, Nick Craig-Wood, Andrew Stone, Jorgen Grahn, Benedek Racz +author-email = betontalpfa@gmail.com +summary = Windows alternative of pexpect +description-file = README.md +description-content-type = text/markdown; charset=UTF-8 +requires-python = >=2.6 +project_urls = + Source Code = https://github.com/raczben/wexpect +license = MIT +classifier = + Development Status :: 4 - Beta + Environment :: Console + Intended Audience :: Developers + Intended Audience :: Information Technology + Operating System :: Windows + Programming Language :: Python +keywords = + scripting, automation, expect, pexpect, wexpect + +[files] +packages = + . + \ No newline at end of file diff --git a/setup.py b/setup.py index d3e1136..2f6ab56 100644 --- a/setup.py +++ b/setup.py @@ -1,144 +1,8 @@ -import io -import os -import sys -from shutil import rmtree -import setuptools +#!/usr/bin/env python -here = os.path.abspath(os.path.dirname(__file__)) -# Import the *local* wexpect: -sys.path.insert(0, here) -import wexpect +from setuptools import setup -# Package meta-data. -NAME = 'wexpect' -DESCRIPTION = 'Windows alternative of pexpect' -URL = 'https://github.com/raczben/wexpect' -EMAIL = 'betontalpfa@gmail.com' -AUTHOR = 'Noah Spurrier, Richard Holden, Marco Molteni, Kimberley Burchett, Robert Stone, Hartmut Goebel, Chad Schroeder, Erick Tryzelaar, Dave Kirby, Ids vander Molen, George Todd, Noel Taylor, Nicolas D. Cesar, Alexander Gattin, Geoffrey Marshall, Francisco Lourenco, Glen Mabey, Karthik Gurusamy, Fernando Perez, Corey Minyard, Jon Cohen, Guillaume Chazarain, Andrew Ryan, Nick Craig-Wood, Andrew Stone, Jorgen Grahn, Benedek Racz' -REQUIRES_PYTHON = '>=2.7.0' -VERSION = wexpect.__version__ - -# What packages are required for this module to be executed? -REQUIRED = [ - 'pypiwin32', -] - -# What packages are optional? -EXTRAS = { - # 'fancy feature': ['django'], -} - - -# Import the README and use it as the long-description. -# Note: this will only work if 'README.md' is present in your MANIFEST.in file! -try: - with io.open(os.path.join(here, 'README.md'), encoding='utf-8') as f: - long_description = '\n' + f.read() -except FileNotFoundError: - long_description = DESCRIPTION - -# Load the package's __version__.py module as a dictionary. -about = {} -if not VERSION: - project_slug = NAME.lower().replace("-", "_").replace(" ", "_") - with open(os.path.join(here, project_slug, '__version__.py')) as f: - exec(f.read(), about) -else: - about['__version__'] = VERSION - - -class UploadCommand(setuptools.Command): - """Support setup.py upload.""" - - description = 'Build and publish YARD.' - user_options = [] - - @staticmethod - def status(s): - """Prints things in bold.""" - print('\033[1m{0}\033[0m'.format(s)) - - def initialize_options(self): - pass - - def finalize_options(self): - pass - - def run(self): - try: - self.status('Removing previous builds...') - rmtree(os.path.join(here, 'dist')) - except OSError: - pass - - self.status('Building Source and Wheel (universal) distribution...') - os.system('{0} setup.py sdist bdist_wheel --universal'.format(sys.executable)) - - self.status('Uploading the package to PyPI via Twine...') - os.system('twine upload dist/*') - - # self.status('Pushing git tags...') - # os.system('git tag v{0}'.format(about['__version__'])) - # os.system('git push --tags') - - sys.exit() - - -class InstallRequirements(setuptools.Command): - """Support setup.py upload.""" - - description = 'Install Requirements' - user_options = [] - - @staticmethod - def status(s): - """Prints things in bold.""" - print('\033[1m{0}\033[0m'.format(s)) - - def initialize_options(self): - pass - - def finalize_options(self): - pass - - def run(self): - self.status('Installing requirements...') - for req in REQUIRED: - os.system('{0} -m pip install "{1}"'.format(sys.executable, req)) - - sys.exit() - - -# Where the magic happens: -setuptools.setup( - name=NAME, - version=about['__version__'], - description=DESCRIPTION, - long_description=long_description, - long_description_content_type='text/markdown', - author=AUTHOR, - author_email=EMAIL, - python_requires=REQUIRES_PYTHON, - url=URL, - packages=['.'], - - install_requires=REQUIRED, - extras_require=EXTRAS, - include_package_data=True, - license='MIT', - classifiers=[ - # Trove classifiers - # Full list: https://pypi.python.org/pypi?%3Aaction=list_classifiers - 'License :: OSI Approved :: MIT License', - 'Programming Language :: Python', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: Implementation :: CPython', - 'Programming Language :: Python :: Implementation :: PyPy' - ], - # $ setup.py publish support. - cmdclass={ - # 'upload': UploadCommand, - 'install_requirements': InstallRequirements - }, +setup( + setup_requires=['pbr'], + pbr=True, ) \ No newline at end of file diff --git a/wexpect.py b/wexpect.py index 8dc8377..931cde0 100644 --- a/wexpect.py +++ b/wexpect.py @@ -74,6 +74,7 @@ try: import traceback import signal import subprocess + import pkg_resources if sys.platform != 'win32': import pty @@ -105,7 +106,10 @@ except ImportError, e: A critical module was not found. Probably this operating system does not support it. Pexpect is intended for UNIX-like operating systems.""") -__version__ = '2.3.1' +try: + __version__ = pkg_resources.require("wexpect")[0].version +except: + __version__ = '0.0.1.unkown0' __revision__ = '$Revision: 399 $' __all__ = ['ExceptionPexpect', 'EOF', 'TIMEOUT', 'spawn', 'run', 'which', 'split_command_line', '__version__', '__revision__'] From 4b33c07eb9568924e9bd2ededb6a7dacce3b7ba7 Mon Sep 17 00:00:00 2001 From: Benedek Racz Date: Thu, 2 May 2019 10:08:28 +0200 Subject: [PATCH 2/2] [FIX] classifiers --- setup.cfg | 6 ++---- setup.py | 3 +++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/setup.cfg b/setup.cfg index 45dd362..8fb84a1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -14,12 +14,10 @@ classifier = Environment :: Console Intended Audience :: Developers Intended Audience :: Information Technology - Operating System :: Windows + Operating System :: Microsoft :: Windows Programming Language :: Python keywords = scripting, automation, expect, pexpect, wexpect -[files] -packages = - . + \ No newline at end of file diff --git a/setup.py b/setup.py index 2f6ab56..3e52fe9 100644 --- a/setup.py +++ b/setup.py @@ -5,4 +5,7 @@ from setuptools import setup setup( setup_requires=['pbr'], pbr=True, + + packages=[''], + py_modules=['wexpect'], ) \ No newline at end of file