Skip to content

Commit

Permalink
Merge pull request #5 from yahoo/remove-packaging-dep
Browse files Browse the repository at this point in the history
Remove 'packaging' as dependency
  • Loading branch information
pumpikano committed Sep 29, 2016
2 parents 0eb07be + 7151af2 commit 6a31eeb
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ python:

install:
- pip install sphinx_rtd_theme codecov packaging
- "python -c $'import os, packaging.version as version\\nv = version.parse(os.environ.get(\"TRAVIS_TAG\", \"1.0\")).public\\nwith open(\"VERSION\", \"w\") as f: f.write(v)'"
- python setup.py install
- cd docs
- make clean html
Expand Down
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
include VERSION
9 changes: 5 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
# Licensed under the terms of the Apache License, Version 2.0. See the LICENSE file associated with the project for terms.

import os
import packaging.version as version

from setuptools import setup

LONG_DESCRIPTION = """
Expand All @@ -16,11 +14,14 @@
"""

# Grab the version as the tag name from the Travis build, or else use a default.
VERSION = os.environ.get('TRAVIS_TAG', '1.0')
if os.path.isfile('VERSION'):
VERSION = open('VERSION').read()
else:
VERSION = os.environ.get('TRAVIS_TAG', '1.0')

setup(
name='graphkit',
version=version.parse(VERSION).public,
version=VERSION,
description='Lightweight computation graphs for Python',
long_description=LONG_DESCRIPTION,
author='Huy Nguyen, Arel Cordero, Pierre Garrigues, Rob Hess, Tobi Baumgartner, Clayton Mellina',
Expand Down

0 comments on commit 6a31eeb

Please sign in to comment.