diff options
| author | Timothy Crosley <timothy.crosley@gmail.com> | 2015-05-07 03:49:19 -0400 |
|---|---|---|
| committer | Timothy Crosley <timothy.crosley@gmail.com> | 2015-05-07 03:49:19 -0400 |
| commit | 3425112092e64223f8b46e682a075d72d24515a6 (patch) | |
| tree | eededfa257e7a74d36aeea7e0ac59a2bae089357 | |
| parent | b0520f615f1b3f90a5820396789a82e3277854c9 (diff) | |
| parent | 575cfb85440eddfd83ba709eb57ceb10cd07fd7b (diff) | |
| download | pies-3425112092e64223f8b46e682a075d72d24515a6.tar.gz | |
Merge branch 'release/2.6.4'2.6.4
| -rw-r--r-- | pies/__init__.py | 2 | ||||
| -rw-r--r-- | pies2overrides/setup.py | 5 | ||||
| -rw-r--r-- | setup.py | 9 |
3 files changed, 11 insertions, 5 deletions
diff --git a/pies/__init__.py b/pies/__init__.py index dbcdf3f..bb7a1eb 100644 --- a/pies/__init__.py +++ b/pies/__init__.py @@ -28,4 +28,4 @@ CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFT OTHER DEALINGS IN THE SOFTWARE. """ -__version__ = "2.6.3" +__version__ = "2.6.4" diff --git a/pies2overrides/setup.py b/pies2overrides/setup.py index 5f0a67b..ed594d7 100644 --- a/pies2overrides/setup.py +++ b/pies2overrides/setup.py @@ -14,14 +14,15 @@ if sys.version_info[0] == 2 and sys.version_info[1] < 7: install_requires += ['ordereddict', 'argparse'] setup(name='pies2overrides', - version='2.6.3', + version='2.6.4', description='Defines override classes that should be included with pies only if running on Python2.', author='Timothy Crosley', author_email='timothy.crosley@gmail.com', url='https://github.com/timothycrosley/pies', - download_url='https://github.com/timothycrosley/pies/blob/master/pies2overrides/dist/pies2overrides-2.6.3.tar.gz?raw=true', + download_url='https://github.com/timothycrosley/pies/blob/master/pies2overrides/dist/pies2overrides-2.6.4.tar.gz?raw=true', license="MIT", install_requires=install_requires, requires=install_requires, + extras_require={':python_version=="2.6"': ['ordereddict', 'argparse']}, py_modules=['configparser', 'builtins', '_thread', 'copyreg', 'queue', 'reprlib', 'socketserver'], packages=['html', 'http', 'xmlrpc']) @@ -24,15 +24,20 @@ except (IOError, ImportError, OSError, RuntimeError): readme = '' setup(name='pies', - version='2.6.3', + version='2.6.4', 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='timothy.crosley@gmail.com', url='https://github.com/timothycrosley/pies', - download_url='https://github.com/timothycrosley/pies/blob/master/dist/pies-2.6.3.tar.gz?raw=true', + download_url='https://github.com/timothycrosley/pies/blob/master/dist/pies-2.6.4.tar.gz?raw=true', license="MIT", install_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']}, requires=install_requires, packages=['pies'], keywords='Python, Python2, Python3, six, future, refactoring, single-code-base', |