Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ build/
dist/
jupyterhub/remoteappmanager.db
jupyterhub/test.key.org
remoteappmanager/version.py
4 changes: 2 additions & 2 deletions doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
from mock_missing import mock_modules
mock_modules()

from remoteappmanager import __version__, MAJOR, MINOR
from remoteappmanager import __version__
from remoteappmanager.command_line_config import CommandLineConfig

# -- General configuration ------------------------------------------------
Expand Down Expand Up @@ -76,7 +76,7 @@
# built documents.
#
# The short X.Y version.
version = '{}.{}'.format(MAJOR, MINOR)
version = '{}.{}'.format(*__version__.split(".")[0:2])
# The full version, including alpha/beta/rc tags.
release = __version__

Expand Down
10 changes: 1 addition & 9 deletions remoteappmanager/__init__.py
Original file line number Diff line number Diff line change
@@ -1,9 +1 @@
MAJOR = 1
MINOR = 1
MICRO = 0
IS_RELEASED = False

__version__ = '%d.%d.%d' % (MAJOR, MINOR, MICRO)

if not IS_RELEASED:
__version__ += '.dev0'
from .version import __version__ # noqa
22 changes: 20 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,27 @@
import os
from setuptools import setup, find_packages

from remoteappmanager import __version__
# Setup version
VERSION = '1.1.0.dev0'

VERSION = __version__
# Read description

with open('README.rst', 'r') as readme:
README_TEXT = readme.read()


def write_version_py():
filename = os.path.join(
os.path.dirname(__file__),
'remoteappmanager',
'version.py')
ver = "__version__ = '{}'\n"
with open(filename, 'w') as fh:
fh.write("# Autogenerated by setup.py\n")
fh.write(ver.format(VERSION))


write_version_py()

requirements = [
"setuptools>=21.0",
Expand Down Expand Up @@ -42,6 +59,7 @@
version=VERSION,
author='SimPhoNy Project',
description='Remote application manager sub-executable',
long_description=README_TEXT,
install_requires=requirements,
packages=find_packages(),
include_package_data=True,
Expand Down