I intend to upload the attached shortly. While NMU of a new upstream release isn't normal, it does, in this case, solve an RC bug, so I think it's a reasonable way to proceed.
Scott K
diff -Nru python-pies-2.6.1/debian/changelog python-pies-2.6.7/debian/changelog --- python-pies-2.6.1/debian/changelog 2014-05-21 05:47:42.000000000 -0400 +++ python-pies-2.6.7/debian/changelog 2015-09-25 23:22:38.000000000 -0400 @@ -1,3 +1,22 @@ +python-pies (2.6.7-0.1) unstable; urgency=medium + + * Non-maintainer upload. + * New upstream release (Closes: #773923) + - Solves configparser conflict (Closes: #751375) + - Rebuild with python3.4 drops python3-enum34 Depends (Closes: #796909) + * Install python-pies2overrides in /usr/lib/python2.7/dist-packages + directly rather than install in /usr/pyshared and symlinking since + pyshared is no longer used + * Remove removal of /usr/lib/python3.4 from debian/rules since it + produced an empty python3 package (Closes: #770261) + * Do not install pies2overrides/xmlrpc sincie it conflicts with + python-futures and is not used in the Debian archive (Closes: #789670) + * Manually add python-pies depends on pies2overrides and enum34 + * Add the actual upstream github location to debian/watch since the + redirector is down + + -- Scott Kitterman <[email protected]> Fri, 25 Sep 2015 22:10:08 -0400 + python-pies (2.6.1-1) unstable; urgency=low * Initial release (Closes: #739115) diff -Nru python-pies-2.6.1/debian/control python-pies-2.6.7/debian/control --- python-pies-2.6.1/debian/control 2014-05-20 11:17:15.000000000 -0400 +++ python-pies-2.6.7/debian/control 2015-09-25 22:58:59.000000000 -0400 @@ -19,7 +19,7 @@ Package: python-pies Architecture: all -Depends: ${misc:Depends}, ${python:Depends} +Depends: ${misc:Depends}, ${python:Depends}, python-pies2overrides, python-enum34 Description: compatibility layer for Python 2 and 3 (Python 2 interface) Pies is a Python 2 and 3 compatibility layer with the philosophy that all code should be Python 3 code. Starting from this viewpoint means that diff -Nru python-pies-2.6.1/debian/rules python-pies-2.6.7/debian/rules --- python-pies-2.6.1/debian/rules 2014-05-20 10:16:18.000000000 -0400 +++ python-pies-2.6.7/debian/rules 2015-09-25 22:53:49.000000000 -0400 @@ -12,15 +12,13 @@ override_dh_auto_install: dh_auto_install -O--buildsystem=pybuild - # remove rampant egg PKG-INFO - rm -rf debian/python3-pies/usr/lib/python3.4 # manual install of pies2overrides because dh_python2 can't handle two # packages, and pyinstall can't install to empty namespace - $(foreach dir,html http xmlrpc,$(shell mkdir -p $(PIES2OVERRIDES_PKG)/usr/share/pyshared/$(dir))) + $(foreach dir,html http xmlrpc,$(shell mkdir -p $(PIES2OVERRIDES_PKG)/usr/lib/python2.7/dist-packages/$(dir))) for file in $$(tail -n+2 pies2overrides/MANIFEST | grep -v setup.py); do \ cp pies2overrides/$$file \ - $(PIES2OVERRIDES_PKG)/usr/share/pyshared/$$file; \ - dh_link -ppython-pies2overrides \ - usr/share/pyshared/$$file \ - usr/lib/python2.7/dist-packages/$$file; \ + $(PIES2OVERRIDES_PKG)/usr/lib/python2.7/dist-packages/$$file; \ done + # Don't install xmlrpc since it conflicts with python-future and is + # not used by anything in the archive + rm -rf $(PIES2OVERRIDES_PKG)/usr/lib/python2.7/dist-packages/xmlrpc diff -Nru python-pies-2.6.1/debian/watch python-pies-2.6.7/debian/watch --- python-pies-2.6.1/debian/watch 2014-02-15 19:08:22.000000000 -0500 +++ python-pies-2.6.7/debian/watch 2015-09-25 20:54:38.000000000 -0400 @@ -1,2 +1,4 @@ version=3 +opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/pies-$1\.tar\.gz/ \ + https://github.com/timothycrosley/pies/tags .*/v?(\d\S*)\.tar\.gz http://githubredir.debian.net/github/timothycrosley/pies/ ([\d\.]+)\.tar\.gz diff -Nru python-pies-2.6.1/.env python-pies-2.6.7/.env --- python-pies-2.6.1/.env 2014-02-24 05:57:40.000000000 -0500 +++ python-pies-2.6.7/.env 2015-07-12 03:34:45.000000000 -0400 @@ -37,9 +37,11 @@ root sudo rm -rf dist build python setup.py sdist upload + python setup.py bdist_wheel upload overrides sudo rm -rf dist build python setup.py sdist upload + python setup.py bdist_wheel upload } function _leave_project() diff -Nru python-pies-2.6.1/.gitignore python-pies-2.6.7/.gitignore --- python-pies-2.6.1/.gitignore 1969-12-31 19:00:00.000000000 -0500 +++ python-pies-2.6.7/.gitignore 2015-07-12 03:34:45.000000000 -0400 @@ -0,0 +1,57 @@ +*.py[cod] +.DS_Store +# C extensions +*.so + +# Packages +*.egg +*.egg-info +build +eggs +parts +var +sdist +develop-eggs +.installed.cfg +lib +lib64 +MANIFEST + +# Installer logs +pip-log.txt +npm-debug.log + +# Unit test / coverage reports +.coverage +.tox +nosetests.xml +htmlcov +.cache + +# Translations +*.mo + +# Mr Developer +.mr.developer.cfg +.project +.pydevproject + +# SQLite +test_exp_framework + +# npm +node_modules/ + +# dolphin +.directory +libpeerconnection.log + +# setuptools +dist + +# IDE Files +atlassian-ide-plugin.xml +.idea/ +*.swp +*.kate-swp +.ropeproject/ diff -Nru python-pies-2.6.1/pies/__init__.py python-pies-2.6.7/pies/__init__.py --- python-pies-2.6.1/pies/__init__.py 2014-02-24 05:57:40.000000000 -0500 +++ python-pies-2.6.7/pies/__init__.py 2015-07-12 03:34:45.000000000 -0400 @@ -28,4 +28,4 @@ OTHER DEALINGS IN THE SOFTWARE. """ -__version__ = "2.6.1" +__version__ = "2.6.7" diff -Nru python-pies-2.6.1/pies/overrides.py python-pies-2.6.7/pies/overrides.py --- python-pies-2.6.1/pies/overrides.py 2014-02-24 05:57:40.000000000 -0500 +++ python-pies-2.6.7/pies/overrides.py 2015-07-12 03:34:45.000000000 -0400 @@ -98,7 +98,11 @@ integer_types = (int, long) import sys + stdout = sys.stdout + stderr = sys.stderr reload(sys) + sys.stdout = stdout + sys.stderr = stderr sys.setdefaultencoding('utf-8') def _create_not_allowed(name): diff -Nru python-pies-2.6.1/pies/StringIO.py python-pies-2.6.7/pies/StringIO.py --- python-pies-2.6.1/pies/StringIO.py 2014-02-24 05:57:40.000000000 -0500 +++ python-pies-2.6.7/pies/StringIO.py 2015-07-12 03:34:45.000000000 -0400 @@ -3,7 +3,7 @@ from .version_info import PY3 if PY3: - from StringIO import * + from io import StringIO else: try: from cStringIO import * diff -Nru python-pies-2.6.1/pies2overrides/configparser.py python-pies-2.6.7/pies2overrides/configparser.py --- python-pies-2.6.1/pies2overrides/configparser.py 2014-02-24 05:57:40.000000000 -0500 +++ python-pies-2.6.7/pies2overrides/configparser.py 1969-12-31 19:00:00.000000000 -0500 @@ -1,3 +0,0 @@ -from __future__ import absolute_import - -from ConfigParser import * diff -Nru python-pies-2.6.1/pies2overrides/setup.py python-pies-2.6.7/pies2overrides/setup.py --- python-pies-2.6.1/pies2overrides/setup.py 2014-02-24 05:57:40.000000000 -0500 +++ python-pies-2.6.7/pies2overrides/setup.py 2015-07-12 03:34:45.000000000 -0400 @@ -9,19 +9,16 @@ except ImportError: from distutils.core import setup -install_requires = ['ipaddress'] -if sys.version_info[0] == 2 and sys.version_info[1] < 7: - install_requires += ['ordereddict', 'argparse'] - setup(name='pies2overrides', - version='2.6.1', + version='2.6.7', description='Defines override classes that should be included with pies only if running on Python2.', author='Timothy Crosley', author_email='[email protected]', url='https://github.com/timothycrosley/pies', - download_url='https://github.com/timothycrosley/pies/blob/master/pies2overrides/dist/pies2overrides-2.6.1.tar.gz?raw=true', + download_url='https://github.com/timothycrosley/pies/blob/master/pies2overrides/dist/pies2overrides-2.6.7.tar.gz?raw=true', license="MIT", - install_requires=install_requires, - requires=install_requires, - py_modules=['configparser', 'builtins', '_thread', 'copyreg', 'queue', 'reprlib', 'socketserver'], + install_requires=['ipaddress'], + requires=['ipaddress'], + extras_require={':python_version=="2.6"': ['ordereddict', 'argparse']}, + py_modules=['configparser', 'builtins', 'copyreg', 'queue', 'reprlib', 'socketserver'], packages=['html', 'http', 'xmlrpc']) diff -Nru python-pies-2.6.1/pies2overrides/_thread.py python-pies-2.6.7/pies2overrides/_thread.py --- python-pies-2.6.1/pies2overrides/_thread.py 2014-02-24 05:57:40.000000000 -0500 +++ python-pies-2.6.7/pies2overrides/_thread.py 1969-12-31 19:00:00.000000000 -0500 @@ -1,3 +0,0 @@ -from __future__ import absolute_import - -from _thread import * diff -Nru python-pies-2.6.1/README.md python-pies-2.6.7/README.md --- python-pies-2.6.1/README.md 2014-02-24 05:57:40.000000000 -0500 +++ python-pies-2.6.7/README.md 2015-07-12 03:34:45.000000000 -0400 @@ -2,6 +2,7 @@ =================== [](http://badge.fury.io/py/pies) [](https://crate.io/packages/pies/) +[](https://travis-ci.org/timothycrosley/pies) [](https://pypi.python.org/pypi/pies/) [](https://bitdeli.com/free "Bitdeli Badge") @@ -31,7 +32,7 @@ How does pies differ from six? =================== -Pies is significantly smaller and simpler then six because it assumes for +Pies is significantly smaller and simpler than six because it assumes for everything possible the developer is using the Python 3 compatible versions included with Python 2.6+, whereas six tries to maintain compatibility with Python 2.4 - leading to many more overrides and further into different language territory. diff -Nru python-pies-2.6.1/setup.py python-pies-2.6.7/setup.py --- python-pies-2.6.1/setup.py 2014-02-24 05:57:40.000000000 -0500 +++ python-pies-2.6.7/setup.py 2015-07-12 03:34:45.000000000 -0400 @@ -8,15 +8,6 @@ except ImportError: from distutils.core import setup -install_requires = [] -if sys.version_info[0] < 3: - install_requires += ['pies2overrides'] -elif sys.version_info[1] < 2: - install_requires += ['argparse'] - -if sys.version_info[0] < 3 or sys.version_info[1] < 4: - install_requires += ['enum34'] - try: import pypandoc readme = pypandoc.convert('README.md', 'rst') @@ -24,16 +15,19 @@ readme = '' setup(name='pies', - version='2.6.1', + version='2.6.7', description='The simplest way to write one program that runs on both Python 2 and Python 3.', long_description=readme, author='Timothy Crosley', author_email='[email protected]', url='https://github.com/timothycrosley/pies', - download_url='https://github.com/timothycrosley/pies/blob/master/dist/pies-2.6.1.tar.gz?raw=true', + download_url='https://github.com/timothycrosley/pies/blob/master/dist/pies-2.6.7.tar.gz?raw=true', license="MIT", - install_requires=install_requires, - requires=install_requires, + extras_require={':python_version=="2.6" or python_version=="2.7"': ['pies2overrides', 'enum34'], + ':python_version=="3.0" or python_version=="3.1" or ' + 'python_version=="3.2" or python_version=="3.3"': ['enum34'], + ':python_version=="3.0" or python_version=="3.1" or python_version=="3.2"': + ['argparse', 'configparser']}, packages=['pies'], keywords='Python, Python2, Python3, six, future, refactoring, single-code-base', classifiers=['Development Status :: 5 - Production/Stable', diff -Nru python-pies-2.6.1/tox.ini python-pies-2.6.7/tox.ini --- python-pies-2.6.1/tox.ini 2014-02-24 05:57:40.000000000 -0500 +++ python-pies-2.6.7/tox.ini 2015-07-12 03:34:45.000000000 -0400 @@ -10,3 +10,14 @@ commands = py.test {posargs} deps pytest + +[py2] +deps + {[testenv]deps} + {toxinidir}/pies2overrides + +[testenv:py26] +deps = {[py2]deps} + +[testenv:py27] +deps = {[py2]deps} diff -Nru python-pies-2.6.1/.travis.yml python-pies-2.6.7/.travis.yml --- python-pies-2.6.1/.travis.yml 1969-12-31 19:00:00.000000000 -0500 +++ python-pies-2.6.7/.travis.yml 2015-07-12 03:34:45.000000000 -0400 @@ -0,0 +1,16 @@ +language: python +python: + - "pypy" + - "2.6" + - "2.7" + - "3.2" + - "3.3" +install: + - if [[ $TRAVIS_PYTHON_VERSION == '2.6' || + $TRAVIS_PYTHON_VERSION == '2.7' || + $TRAVIS_PYTHON_VERSION == 'pypy' ]]; then + pip install ./pies2overrides; + fi +script: + - pip install pytest + - py.test
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ Python-modules-team mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/python-modules-team
