From 2cc20e3a3f138d35fe50719a0ff9d7c101545c3f Mon Sep 17 00:00:00 2001 From: Sergio Guadarrama Date: Tue, 17 Jul 2018 23:54:04 +0000 Subject: [PATCH] Move version to setup.py, fix enum34 requirement. PiperOrigin-RevId: 204999443 --- gin/__init__.py | 2 -- setup.py | 11 ++++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/gin/__init__.py b/gin/__init__.py index c9e5c71..e864aa4 100644 --- a/gin/__init__.py +++ b/gin/__init__.py @@ -14,8 +14,6 @@ # limitations under the License. """Init file for Gin.""" -__version__ = '0.1.1.1' - from gin.config import bind_parameter from gin.config import clear_config from gin.config import config_is_locked diff --git a/setup.py b/setup.py index 02ca6e8..382effe 100644 --- a/setup.py +++ b/setup.py @@ -23,22 +23,27 @@ import codecs from os import path -import gin +import sys from setuptools import find_packages from setuptools import setup +_VERSION = '0.1.1.2' + here = path.abspath(path.dirname(__file__)) # Get the long description from the README file with codecs.open(path.join(here, 'README.md'), encoding='utf-8') as f: long_description = f.read() -install_requires = ['six >= 1.10.0', 'enum34;python_version<"3.4"'] +install_requires = ['six >= 1.10.0'] test_requirements = ['six >= 1.10.0', 'absl-py >= 0.1.6'] +if sys.version_info < (3, 4): + install_requires.append('enum34 >= 1.1.6') + setup( name='gin-config', - version=gin.__version__, + version=_VERSION, include_package_data=True, packages=find_packages(exclude=['docs']), # Required package_data={'testdata': ['testdata/*.gin']},