Hello community, here is the log from the commit of package python-EasyProcess for openSUSE:Factory checked in at 2015-05-07 09:22:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-EasyProcess (Old) and /work/SRC/openSUSE:Factory/.python-EasyProcess.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-EasyProcess" Changes: -------- --- /work/SRC/openSUSE:Factory/python-EasyProcess/python-EasyProcess.changes 2013-10-25 11:14:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-EasyProcess.new/python-EasyProcess.changes 2015-05-07 09:22:32.000000000 +0200 @@ -1,0 +2,6 @@ +Mon May 4 13:36:58 UTC 2015 - benoit.mo...@gmx.fr + +- update to version 0.1.9: + * no changelog available + +------------------------------------------------------------------- Old: ---- EasyProcess-0.1.6.tar.gz New: ---- EasyProcess-0.1.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-EasyProcess.spec ++++++ --- /var/tmp/diff_new_pack.JairrE/_old 2015-05-07 09:22:32.000000000 +0200 +++ /var/tmp/diff_new_pack.JairrE/_new 2015-05-07 09:22:32.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-EasyProcess # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: python-EasyProcess -Version: 0.1.6 +Version: 0.1.9 Release: 0 Url: https://github.com/ponty/easyprocess Summary: Easy to use python subprocess interface ++++++ EasyProcess-0.1.6.tar.gz -> EasyProcess-0.1.9.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/EasyProcess-0.1.6/EasyProcess.egg-info/PKG-INFO new/EasyProcess-0.1.9/EasyProcess.egg-info/PKG-INFO --- old/EasyProcess-0.1.6/EasyProcess.egg-info/PKG-INFO 2013-02-16 18:09:41.000000000 +0100 +++ new/EasyProcess-0.1.9/EasyProcess.egg-info/PKG-INFO 2015-03-19 21:50:05.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: EasyProcess -Version: 0.1.6 +Version: 0.1.9 Summary: Easy to use python subprocess interface. Home-page: https://github.com/ponty/easyprocess Author: ponty @@ -12,6 +12,8 @@ * home: https://github.com/ponty/EasyProcess * documentation: http://ponty.github.com/EasyProcess + |Travis| |Coveralls| |Latest Version| |Supported Python versions| |License| |Downloads| |Code Health| + Features: - layer on top of subprocess_ module - easy to start, stop programs @@ -27,7 +29,7 @@ - stdout/stderr is set only after the subprocess has finished - stop() does not kill whole subprocess tree - unicode support - - supported python versions: 2.5, 2.6, 2.7, 3.1, 3.2, PyPy + - supported python versions: 2.6, 2.7, 3.2, 3.3, 3.4 Known problems: - none @@ -41,7 +43,7 @@ * plumbum (https://github.com/tomerfiliba/plumbum) Basic usage - ============ + =========== >>> from easyprocess import EasyProcess >>> EasyProcess('python --version').call().stderr @@ -51,7 +53,7 @@ ============ General - -------- + ------- * install pip_ * install the program:: @@ -60,14 +62,14 @@ pip install EasyProcess Ubuntu - ---------- + ------ :: sudo apt-get install python-pip sudo pip install EasyProcess Uninstall - ---------- + --------- :: # as root @@ -77,7 +79,27 @@ .. _setuptools: http://peak.telecommunity.com/DevCenter/EasyInstall .. _pip: http://pip.openplans.org/ .. _subprocess: http://docs.python.org/library/subprocess.html + .. |Travis| image:: http://img.shields.io/travis/ponty/EasyProcess.svg + :target: https://travis-ci.org/ponty/EasyProcess/ + .. |Coveralls| image:: http://img.shields.io/coveralls/ponty/EasyProcess/master.svg + :target: https://coveralls.io/r/ponty/EasyProcess/ + .. |Latest Version| image:: https://pypip.in/version/EasyProcess/badge.svg?style=flat + :target: https://pypi.python.org/pypi/EasyProcess/ + .. |Supported Python versions| image:: https://pypip.in/py_versions/EasyProcess/badge.svg?style=flat + :target: https://pypi.python.org/pypi/EasyProcess/ + .. |License| image:: https://pypip.in/license/EasyProcess/badge.svg?style=flat + :target: https://pypi.python.org/pypi/EasyProcess/ + .. |Downloads| image:: https://pypip.in/download/EasyProcess/badge.svg?style=flat + :target: https://pypi.python.org/pypi/EasyProcess/ + .. |Code Health| image:: https://landscape.io/github/ponty/EasyProcess/master/landscape.svg?style=flat + :target: https://landscape.io/github/ponty/EasyProcess/master + + + + + + Keywords: subprocess interface Platform: UNKNOWN Classifier: License :: OSI Approved :: BSD License @@ -85,9 +107,9 @@ Classifier: Operating System :: OS Independent Classifier: Programming Language :: Python Classifier: Programming Language :: Python :: 2 -Classifier: Programming Language :: Python :: 2.5 Classifier: Programming Language :: Python :: 2.6 Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.1 Classifier: Programming Language :: Python :: 3.2 +Classifier: Programming Language :: Python :: 3.3 +Classifier: Programming Language :: Python :: 3.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/EasyProcess-0.1.6/EasyProcess.egg-info/SOURCES.txt new/EasyProcess-0.1.9/EasyProcess.egg-info/SOURCES.txt --- old/EasyProcess-0.1.6/EasyProcess.egg-info/SOURCES.txt 2013-02-16 18:09:41.000000000 +0100 +++ new/EasyProcess-0.1.9/EasyProcess.egg-info/SOURCES.txt 2015-03-19 21:50:05.000000000 +0100 @@ -3,12 +3,10 @@ README.rst TODO pavement.py -requirements.txt setup.py EasyProcess.egg-info/PKG-INFO EasyProcess.egg-info/SOURCES.txt EasyProcess.egg-info/dependency_links.txt -EasyProcess.egg-info/not-zip-safe EasyProcess.egg-info/top_level.txt docs/api.rst docs/conf.py @@ -17,6 +15,7 @@ docs/readme.rst docs/usage.rst easyprocess/__init__.py +easyprocess/about.py easyprocess/unicodeutil.py easyprocess/examples/__init__.py easyprocess/examples/log.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/EasyProcess-0.1.6/EasyProcess.egg-info/not-zip-safe new/EasyProcess-0.1.9/EasyProcess.egg-info/not-zip-safe --- old/EasyProcess-0.1.6/EasyProcess.egg-info/not-zip-safe 2013-02-11 08:04:56.000000000 +0100 +++ new/EasyProcess-0.1.9/EasyProcess.egg-info/not-zip-safe 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/EasyProcess-0.1.6/MANIFEST.in new/EasyProcess-0.1.9/MANIFEST.in --- old/EasyProcess-0.1.6/MANIFEST.in 2013-02-16 18:09:41.000000000 +0100 +++ new/EasyProcess-0.1.9/MANIFEST.in 2015-03-19 21:30:14.000000000 +0100 @@ -1,8 +1,6 @@ graft docs include LICENSE* -include pavement.py include TODO* -include requirements.txt include CHANGES* include README* include setup.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/EasyProcess-0.1.6/PKG-INFO new/EasyProcess-0.1.9/PKG-INFO --- old/EasyProcess-0.1.6/PKG-INFO 2013-02-16 18:09:41.000000000 +0100 +++ new/EasyProcess-0.1.9/PKG-INFO 2015-03-19 21:50:05.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: EasyProcess -Version: 0.1.6 +Version: 0.1.9 Summary: Easy to use python subprocess interface. Home-page: https://github.com/ponty/easyprocess Author: ponty @@ -12,6 +12,8 @@ * home: https://github.com/ponty/EasyProcess * documentation: http://ponty.github.com/EasyProcess + |Travis| |Coveralls| |Latest Version| |Supported Python versions| |License| |Downloads| |Code Health| + Features: - layer on top of subprocess_ module - easy to start, stop programs @@ -27,7 +29,7 @@ - stdout/stderr is set only after the subprocess has finished - stop() does not kill whole subprocess tree - unicode support - - supported python versions: 2.5, 2.6, 2.7, 3.1, 3.2, PyPy + - supported python versions: 2.6, 2.7, 3.2, 3.3, 3.4 Known problems: - none @@ -41,7 +43,7 @@ * plumbum (https://github.com/tomerfiliba/plumbum) Basic usage - ============ + =========== >>> from easyprocess import EasyProcess >>> EasyProcess('python --version').call().stderr @@ -51,7 +53,7 @@ ============ General - -------- + ------- * install pip_ * install the program:: @@ -60,14 +62,14 @@ pip install EasyProcess Ubuntu - ---------- + ------ :: sudo apt-get install python-pip sudo pip install EasyProcess Uninstall - ---------- + --------- :: # as root @@ -77,7 +79,27 @@ .. _setuptools: http://peak.telecommunity.com/DevCenter/EasyInstall .. _pip: http://pip.openplans.org/ .. _subprocess: http://docs.python.org/library/subprocess.html + .. |Travis| image:: http://img.shields.io/travis/ponty/EasyProcess.svg + :target: https://travis-ci.org/ponty/EasyProcess/ + .. |Coveralls| image:: http://img.shields.io/coveralls/ponty/EasyProcess/master.svg + :target: https://coveralls.io/r/ponty/EasyProcess/ + .. |Latest Version| image:: https://pypip.in/version/EasyProcess/badge.svg?style=flat + :target: https://pypi.python.org/pypi/EasyProcess/ + .. |Supported Python versions| image:: https://pypip.in/py_versions/EasyProcess/badge.svg?style=flat + :target: https://pypi.python.org/pypi/EasyProcess/ + .. |License| image:: https://pypip.in/license/EasyProcess/badge.svg?style=flat + :target: https://pypi.python.org/pypi/EasyProcess/ + .. |Downloads| image:: https://pypip.in/download/EasyProcess/badge.svg?style=flat + :target: https://pypi.python.org/pypi/EasyProcess/ + .. |Code Health| image:: https://landscape.io/github/ponty/EasyProcess/master/landscape.svg?style=flat + :target: https://landscape.io/github/ponty/EasyProcess/master + + + + + + Keywords: subprocess interface Platform: UNKNOWN Classifier: License :: OSI Approved :: BSD License @@ -85,9 +107,9 @@ Classifier: Operating System :: OS Independent Classifier: Programming Language :: Python Classifier: Programming Language :: Python :: 2 -Classifier: Programming Language :: Python :: 2.5 Classifier: Programming Language :: Python :: 2.6 Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.1 Classifier: Programming Language :: Python :: 3.2 +Classifier: Programming Language :: Python :: 3.3 +Classifier: Programming Language :: Python :: 3.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/EasyProcess-0.1.6/README.rst new/EasyProcess-0.1.9/README.rst --- old/EasyProcess-0.1.6/README.rst 2012-12-05 09:22:29.000000000 +0100 +++ new/EasyProcess-0.1.9/README.rst 2015-03-19 20:36:07.000000000 +0100 @@ -4,6 +4,8 @@ * home: https://github.com/ponty/EasyProcess * documentation: http://ponty.github.com/EasyProcess +|Travis| |Coveralls| |Latest Version| |Supported Python versions| |License| |Downloads| |Code Health| + Features: - layer on top of subprocess_ module - easy to start, stop programs @@ -19,7 +21,7 @@ - stdout/stderr is set only after the subprocess has finished - stop() does not kill whole subprocess tree - unicode support - - supported python versions: 2.5, 2.6, 2.7, 3.1, 3.2, PyPy + - supported python versions: 2.6, 2.7, 3.2, 3.3, 3.4 Known problems: - none @@ -33,7 +35,7 @@ * plumbum (https://github.com/tomerfiliba/plumbum) Basic usage -============ +=========== >>> from easyprocess import EasyProcess >>> EasyProcess('python --version').call().stderr @@ -43,7 +45,7 @@ ============ General --------- +------- * install pip_ * install the program:: @@ -52,14 +54,14 @@ pip install EasyProcess Ubuntu ----------- +------ :: sudo apt-get install python-pip sudo pip install EasyProcess Uninstall ----------- +--------- :: # as root @@ -69,3 +71,24 @@ .. _setuptools: http://peak.telecommunity.com/DevCenter/EasyInstall .. _pip: http://pip.openplans.org/ .. _subprocess: http://docs.python.org/library/subprocess.html +.. |Travis| image:: http://img.shields.io/travis/ponty/EasyProcess.svg + :target: https://travis-ci.org/ponty/EasyProcess/ +.. |Coveralls| image:: http://img.shields.io/coveralls/ponty/EasyProcess/master.svg + :target: https://coveralls.io/r/ponty/EasyProcess/ +.. |Latest Version| image:: https://pypip.in/version/EasyProcess/badge.svg?style=flat + :target: https://pypi.python.org/pypi/EasyProcess/ +.. |Supported Python versions| image:: https://pypip.in/py_versions/EasyProcess/badge.svg?style=flat + :target: https://pypi.python.org/pypi/EasyProcess/ +.. |License| image:: https://pypip.in/license/EasyProcess/badge.svg?style=flat + :target: https://pypi.python.org/pypi/EasyProcess/ +.. |Downloads| image:: https://pypip.in/download/EasyProcess/badge.svg?style=flat + :target: https://pypi.python.org/pypi/EasyProcess/ +.. |Code Health| image:: https://landscape.io/github/ponty/EasyProcess/master/landscape.svg?style=flat + :target: https://landscape.io/github/ponty/EasyProcess/master + + + + + + + \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/EasyProcess-0.1.6/docs/conf.py new/EasyProcess-0.1.9/docs/conf.py --- old/EasyProcess-0.1.6/docs/conf.py 2012-12-03 13:11:09.000000000 +0100 +++ new/EasyProcess-0.1.9/docs/conf.py 2015-03-19 20:36:07.000000000 +0100 @@ -2,24 +2,13 @@ import logging import sphinx import sys -from setuptools import find_packages +sys.path.append('..') +import easyprocess +sys.path.pop() -def read_project_version(py=None, where='.', exclude=['bootstrap', 'pavement', 'doc', 'docs', 'test', 'tests', ]): - if not py: - py = path(where) / find_packages(where=where, exclude=exclude)[0] - py = path(py) - if py.isdir(): - py = py / '__init__.py' - __version__ = None - for line in py.lines(): - if '__version__' in line: - exec line - break - return __version__ - - -release = read_project_version(where='..') +release = easyprocess.__version__ +print release project = 'EasyProcess' author = 'ponty' copyright = '2011, ponty' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/EasyProcess-0.1.6/easyprocess/__init__.py new/EasyProcess-0.1.9/easyprocess/__init__.py --- old/EasyProcess-0.1.6/easyprocess/__init__.py 2013-02-16 17:46:35.000000000 +0100 +++ new/EasyProcess-0.1.9/easyprocess/__init__.py 2015-03-19 20:36:07.000000000 +0100 @@ -8,18 +8,17 @@ import platform import signal import subprocess -import sys import tempfile import threading import time import ConfigParser -__version__ = '0.1.6' +from easyprocess.about import __version__ log = logging.getLogger(__name__) # log=logging -log.debug('version=' + __version__) +log.debug('version=%s', __version__) CONFIG_FILE = '.easyprocess.cfg' SECTION_LINK = 'link' @@ -62,7 +61,7 @@ return msg -class EasyProcess(): +class EasyProcess(object): ''' .. module:: easyprocess @@ -107,15 +106,16 @@ self.cmd = cmd self.cmd_as_string = ' '.join(self.cmd) # TODO: not perfect - log.debug('param: "%s" command: %s ("%s")' % ( - self.cmd_param, self.cmd, self.cmd_as_string)) + log.debug('param: "%s" ', self.cmd_param) + log.debug('command: %s', self.cmd) + log.debug('joined command: %s', self.cmd_as_string) if not len(cmd): raise EasyProcessError(self, 'empty command!') if not Proc.config: conf_file = os.path.join(os.path.expanduser('~'), CONFIG_FILE) - log.debug('reading config: %s' % (conf_file)) + log.debug('reading config: %s', conf_file) Proc.config = ConfigParser.RawConfigParser() Proc.config.read(conf_file) @@ -128,11 +128,11 @@ pass if self.alias: - log.debug('alias found: %s' % (self.alias)) + log.debug('alias found: %s', self.alias) self.cmd[0] = self.alias def __repr__(self): - msg = '<%s cmd_param=%s alias={alias} cmd=%s ({scmd}) oserror=%s returncode=%s stdout="%s" stderr="%s" timeout=%s>' % ( + msg = '<%s cmd_param=%s cmd=%s oserror=%s returncode=%s stdout="%s" stderr="%s" timeout=%s>' % ( self.__class__.__name__, self.cmd_param, self.cmd, @@ -255,11 +255,11 @@ cwd=self.cwd, ) except OSError, oserror: - log.debug('OSError exception:%s' % (oserror)) + log.debug('OSError exception: %s', oserror) self.oserror = oserror raise EasyProcessError(self, 'start error') self.is_started = True - log.debug('process was started (pid=%s)' % (str(self.pid),)) + log.debug('process was started (pid=%s)', self.pid) # def target(): # self._wait4process() @@ -360,14 +360,14 @@ self.stdout = remove_ending_lf(unidecode(self.stdout)) self.stderr = remove_ending_lf(unidecode(self.stderr)) - log.debug('return code=' + str(self.return_code)) + log.debug('return code=%s', self.return_code) # def limit_str(s): # if len(s) > self.max_bytes_to_log: # warn = '[middle of output was removed, max_bytes_to_log=%s]'%(self.max_bytes_to_log) # s = s[:self.max_bytes_to_log / 2] + warn + s[-self.max_bytes_to_log / 2:] # return s - log.debug('stdout=' + (self.stdout)) - log.debug('stderr=' + (self.stderr)) + log.debug('stdout=%s', self.stdout) + log.debug('stderr=%s', self.stderr) def stop(self): ''' @@ -392,8 +392,7 @@ if not self.is_started: raise EasyProcessError(self, 'process was not started!') - log.debug( - 'stopping process (pid=%s cmd="%s")' % (str(self.pid), self.cmd)) + log.debug('stopping process (pid=%s cmd="%s")', self.pid, self.cmd) if self.popen: if self.is_alive(): log.debug('process is active -> sending SIGTERM') @@ -404,7 +403,7 @@ except AttributeError: os.kill(self.popen.pid, signal.SIGKILL) except OSError, oserror: - log.debug('exception in terminate:%s' % (oserror)) + log.debug('exception in terminate:%s', oserror) else: log.debug('process was already stopped') @@ -443,7 +442,7 @@ try: x = func() except OSError, oserror: - log.debug('OSError exception:%s' % (oserror)) + log.debug('OSError exception:%s', oserror) self.oserror = oserror raise EasyProcessError(self, 'wrap error!') finally: @@ -477,3 +476,4 @@ Proc = EasyProcess + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/EasyProcess-0.1.6/easyprocess/about.py new/EasyProcess-0.1.9/easyprocess/about.py --- old/EasyProcess-0.1.6/easyprocess/about.py 1970-01-01 01:00:00.000000000 +0100 +++ new/EasyProcess-0.1.9/easyprocess/about.py 2015-03-19 21:49:40.000000000 +0100 @@ -0,0 +1 @@ +__version__ = '0.1.9' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/EasyProcess-0.1.6/pavement.py new/EasyProcess-0.1.9/pavement.py --- old/EasyProcess-0.1.6/pavement.py 2012-12-03 13:11:08.000000000 +0100 +++ new/EasyProcess-0.1.9/pavement.py 2015-03-19 21:35:42.000000000 +0100 @@ -8,13 +8,15 @@ from paved.docs import * from paved.pycheck import * from paved.pkg import * -from sphinxcontrib import paverutils from setuptools import find_packages +import sys # get info from setup.py +sys.path.append('.') setup_py = ''.join( - [x for x in path('setup.py').lines() if 'setuptools' not in x]) + [x for x in path('setup.py').lines() if 'distutils' not in x]) exec(setup_py) +sys.path.pop() options( @@ -22,10 +24,10 @@ docroot='docs', builddir="_build", ), - pdf=Bunch( - builddir='_build', - builder='latex', - ), +# pdf=Bunch( +# builddir='_build', +# builder='latex', +# ), ) @@ -46,17 +48,18 @@ options.paved.dist.manifest.include.remove('distribute_setup.py') options.paved.dist.manifest.include.remove('paver-minilib.zip') -options.paved.dist.manifest.include.add('requirements.txt') +# options.paved.dist.manifest.include.add('requirements.txt') +# options.paved.dist.manifest.include.add('versioneer.py') @task @needs( - # 'clean', 'sloccount', 'html', 'pdf', 'sdist', - 'nose', 'tox', + 'nose', + 'tox', ) def alltest(): 'all tasks to check' @@ -64,28 +67,9 @@ @task -@needs('sphinxcontrib.paverutils.html') -def html(): - pass - - -@task -@needs('sphinxcontrib.paverutils.pdf') -def pdf(): - fpdf = list(path('docs/_build/latex').walkfiles('*.pdf'))[0] - d = path('docs/_build/html') - d.makedirs() - fpdf.copy(d) - - -@task -def tox(): - '''Run tox.''' - sh('tox') - - -@task -@needs('manifest', 'setuptools.command.sdist') +@needs('manifest', + 'distutils.command.sdist', + ) def sdist(): """Overrides sdist to make sure that our MANIFEST.in is generated. """ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/EasyProcess-0.1.6/requirements.txt new/EasyProcess-0.1.9/requirements.txt --- old/EasyProcess-0.1.6/requirements.txt 2012-03-05 21:19:51.000000000 +0100 +++ new/EasyProcess-0.1.9/requirements.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/EasyProcess-0.1.6/setup.py new/EasyProcess-0.1.9/setup.py --- old/EasyProcess-0.1.6/setup.py 2012-12-03 13:11:08.000000000 +0100 +++ new/EasyProcess-0.1.9/setup.py 2015-03-19 21:46:43.000000000 +0100 @@ -1,23 +1,19 @@ -from setuptools import find_packages, setup -import os.path +from setuptools import setup import sys +import os - -def read_project_version(package): - py = os.path.join(package, '__init__.py') - __version__ = None - for line in open(py).read().splitlines(): - if '__version__' in line: - exec(line) - break - return __version__ - -PACKAGE = 'easyprocess' -NAME = 'EasyProcess' +NAME = 'easyprocess' +PYPI_NAME = 'EasyProcess' URL = 'https://github.com/ponty/easyprocess' DESCRIPTION = 'Easy to use python subprocess interface.' -VERSION = read_project_version(PACKAGE) - +PACKAGES = [NAME, + NAME + '.examples', + ] + +# get __version__ +__version__ = None +exec(open(os.path.join(NAME, 'about.py')).read()) +VERSION = __version__ extra = {} if sys.version_info >= (3,): @@ -34,21 +30,21 @@ "Programming Language :: Python :: 2", # "Programming Language :: Python :: 2.3", # "Programming Language :: Python :: 2.4", - "Programming Language :: Python :: 2.5", + #"Programming Language :: Python :: 2.5", "Programming Language :: Python :: 2.6", "Programming Language :: Python :: 2.7", # "Programming Language :: Python :: 2 :: Only", "Programming Language :: Python :: 3", # "Programming Language :: Python :: 3.0", - "Programming Language :: Python :: 3.1", +# "Programming Language :: Python :: 3.1", "Programming Language :: Python :: 3.2", - # "Programming Language :: Python :: 3.3", + "Programming Language :: Python :: 3.3", + "Programming Language :: Python :: 3.4", ] -install_requires = open("requirements.txt").read().split('\n') setup( - name=NAME, + name=PYPI_NAME, version=VERSION, description=DESCRIPTION, long_description=open('README.rst', 'r').read(), @@ -58,10 +54,6 @@ # author_email='', url=URL, license='BSD', - packages=find_packages(exclude=['bootstrap', 'pavement', ]), - include_package_data=True, - test_suite='nose.collector', - zip_safe=False, - install_requires=install_requires, + packages=PACKAGES, **extra )