Skip to content

Commit

Permalink
version is set in one place
Browse files Browse the repository at this point in the history
  • Loading branch information
bast committed Oct 16, 2018
1 parent 5e066c6 commit ddc0eb4
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 27 deletions.
2 changes: 1 addition & 1 deletion cicero/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
from .version import version_info, version as __version__
from .version import version_info, __version__
9 changes: 5 additions & 4 deletions cicero/version.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
from collections import namedtuple

version = '0.0.0-alpha-x'
__version__ = '0.1.0-rc-1'

version_info = namedtuple('version_info', ['major', 'minor', 'micro', 'releaselevel'])
version_info = namedtuple('version_info',
['major', 'minor', 'micro', 'releaselevel'])

major_minor_micro = version.split('-')[0]
major_minor_micro = __version__.split('-')[0]

s = major_minor_micro.split('.')

version_info.major = int(s[0])
version_info.minor = int(s[1])
version_info.micro = int(s[2])

version_info.releaselevel = version[len(major_minor_micro) + 1:]
version_info.releaselevel = __version__[len(major_minor_micro) + 1:]
58 changes: 36 additions & 22 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,19 @@
#!/usr/bin/env python
from setuptools import setup
import os
import sys

from distutils.core import setup
_here = os.path.abspath(os.path.dirname(__file__))

import os
if sys.version_info[0] < 3:
with open(os.path.join(_here, 'README.rst')) as f:
long_description = f.read()
else:
with open(os.path.join(_here, 'README.rst'), encoding='utf-8') as f:
long_description = f.read()

version = {}
with open(os.path.join(_here, 'cicero', 'version.py')) as f:
exec(f.read(), version)

def package_files(directory):
paths = []
Expand All @@ -14,22 +25,25 @@ def package_files(directory):
extra_files = package_files('cicero/static') + \
package_files('cicero/templates')

setup(name='cicero',
version='0.1.0',
description='Cicero - Serving presentation slides written in Markdown.',
author='Radovan Bast',
author_email='bast@users.noreply.github.com',
url='https://github.com/bast/cicero',
packages=['cicero'],
package_data={'': extra_files},
license='GNU Lesser General Public License 2.1',
entry_points={
'console_scripts': [
'cicero = cicero.main:main'
]
},
install_requires=[
'requests==2.19.1',
'flask==1.0.2'
]
)
setup(
name='cicero',
version=version['__version__'],
description='Cicero - Serving presentation slides written in Markdown.',
long_description=long_description,
author='Radovan Bast',
author_email='bast@users.noreply.github.com',
url='https://github.com/bast/cicero',
license='GNU Lesser General Public License 2.1',
packages=['cicero'],
package_data={'': extra_files},
entry_points={'console_scripts': ['cicero = cicero.main:main']},
install_requires=[
'requests==2.19.1',
'flask==1.0.2'
],
classifiers=[
'Development Status :: 5 - Production/Stable',
'Intended Audience :: Science/Research',
'Programming Language :: Python :: 3.6'
],
)

0 comments on commit ddc0eb4

Please sign in to comment.