Manage version strings manually (#420)

docs/conf.py

@@ -24,11 +24,11 @@
 
 # -- Project information -----------------------------------------------------
 
-# General project metadata is stored in .bumpversion.cfg
-with open(os.path.join(root, '.bumpversion.cfg')) as project_file:
+# General project metadata is stored in project.cfg
+with open(os.path.join(root, 'project.cfg')) as project_file:
     config = ConfigParser()
     config.read_file(project_file)
-    project_meta = dict(config.items('bumpversion'))
+    project_meta = dict(config.items('project'))
 
 project = project_meta['project']
 author = project_meta['author']
@@ -38,7 +38,7 @@
 title = project + ' Documentation'
 
 # The full version, including alpha/beta/rc tags
-release = project_meta['current_version']
+release = project_meta['version']
 # The short X.Y.Z version
 version = re.sub('[^0-9.].*$', '', release)
 

project.cfg

@@ -0,0 +1,12 @@
+[project]
+name = Rx
+project = RxPY
+# Please make sure the version here remains the same as in rx/__init__.py
+version = 3.0.0b4
+description = Reactive Extensions (Rx) for Python
+author = Dag Brattli
+author_email = dag@brattli.net
+copyright = Copyright 2013-2019, Dag Brattli, Microsoft Corp., and Contributors
+license = MIT License
+url = http://reactivex.io
+download_url = https://github.com/ReactiveX/RxPY

rx/__init__.py

@@ -6,7 +6,9 @@
 from .core import Observable, typing, pipe
 from .core.typing import Mapper, Predicate
 
-__version__ = "3.0.0-beta4"
+
+# Please make sure the version here remains the same as in project.cfg
+__version__ = '3.0.0b4'
 
 
 def amb(*sources: Observable) -> Observable:

setup.py

@@ -10,11 +10,11 @@
 from configparser import ConfigParser
 
 
-# General project metadata is stored in .bumpversion.cfg
-with open('.bumpversion.cfg') as project_file:
+# General project metadata is stored in project.cfg
+with open('project.cfg') as project_file:
     config = ConfigParser()
     config.read_file(project_file)
-    project_meta = dict(config.items('bumpversion'))
+    project_meta = dict(config.items('project'))
 
 
 # Populate the long_description field from README.rst
@@ -25,7 +25,7 @@
 setup(
     **{key: project_meta[key] for key in (
         'name',
-        'current_version',
+        'version',
         'description',
         'long_description',
         'author',
@@ -34,7 +34,6 @@
         'url',
         'download_url'
     )},
-    version=project_meta.get("current_version"),
     zip_safe=True,
     python_requires='>=3.6.0',
 
@@ -57,7 +56,7 @@
     package_data={'rx': ['py.typed']},
     packages=['rx', 'rx.internal', 'rx.core', 'rx.core.abc',
               'rx.core.operators', 'rx.core.operators.connectable',
-              'rx.core.observer', 'rx.core.observable',
+              'rx.core.observable', 'rx.core.observer',
               'rx.scheduler', 'rx.scheduler.eventloop', 'rx.scheduler.mainloop',
               'rx.operators', 'rx.disposable', 'rx.subject',
               'rx.testing'],

tests/test_version.py

@@ -0,0 +1,27 @@
+import unittest
+
+from configparser import ConfigParser
+from os.path import abspath, dirname, join
+from re import match
+
+
+class VersionTest(unittest.TestCase):
+
+    def test_version(self):
+
+        root = abspath(join(dirname(__file__), '..'))
+
+        with open(join(root, 'project.cfg')) as project_file:
+            config = ConfigParser()
+            config.read_file(project_file)
+            project_meta = dict(config.items('project'))
+
+        version = None
+        with open(join(root, 'rx', '__init__.py')) as init_py:
+            for line in init_py:
+                version = match('\\s*__version__\\s*=\\s*[\'"](.*)[\'"]', line)
+                if version is not None:
+                    version = version.group(1)
+                    break
+
+        assert project_meta['version'] == version