Skip to content

Commit

Permalink
Move version to setup.py, fix enum34 requirement.
Browse files Browse the repository at this point in the history
PiperOrigin-RevId: 204999443
  • Loading branch information
sguada authored and dhr committed Nov 7, 2018
1 parent 879de0b commit 2cc20e3
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
2 changes: 0 additions & 2 deletions gin/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 8 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):

This comment has been minimized.

Copy link
@w4-jaesup

w4-jaesup Apr 12, 2019

This seems wrong.
enum34 is always installed even though I'm on Python 3.4+ if I pip install gin-config.
(And probably you ran this setup.py with Python version below 3.4 to upload PYPI.)

This comment has been minimized.

Copy link
@sguada

sguada May 20, 2019

Author Collaborator

Thanks for pointing this out, will take a look on how to fix it.

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']},
Expand Down

0 comments on commit 2cc20e3

Please sign in to comment.