Skip to content

Commit

Permalink
Fixups after installing versioneer
Browse files Browse the repository at this point in the history
  • Loading branch information
betatim committed Apr 14, 2019
1 parent d339b06 commit b7f9046
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
1 change: 0 additions & 1 deletion binderhub/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from ._version import __version__
# next three lines were added by versioneer
from ._version import get_versions
__version__ = get_versions()['version']
Expand Down
2 changes: 1 addition & 1 deletion binderhub/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from tornado import web
from jupyterhub.services.auth import HubOAuthenticated, HubOAuth

from ._version import __version__ as binder_version
from . import __version__ as binder_version


class BaseHandler(HubOAuthenticated, web.RequestHandler):
Expand Down
12 changes: 6 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,18 @@
from setuptools import setup, find_packages
import subprocess

# get the version
version_ns = {}
import versioneer


here = os.path.dirname(__file__)
with open(os.path.join(here, 'binderhub', '_version.py')) as f:
exec(f.read(), {}, version_ns)

with open(os.path.join(here, 'requirements.txt')) as f:
requirements = [
l.strip() for l in f.readlines()
if not l.strip().startswith('#')
]

with open('README.rst', encoding="utf8") as f:
with open(os.path.join(here, 'README.rst'), encoding="utf8") as f:
readme = f.read()

# Build our js and css files before packaging
Expand All @@ -28,7 +27,8 @@

setup(
name='binderhub',
version=version_ns['__version__'],
version=versioneer.get_version(),
cmdclass=versioneer.get_cmdclass(),
python_requires='>=3.6',
author='Project Jupyter Contributors',
author_email='[email protected]',
Expand Down

0 comments on commit b7f9046

Please sign in to comment.