Merge pull request #89 from c3g/bump-version

Bump version to 0.5.2

.readthedocs.yml

@@ -2,7 +2,7 @@
 # See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
 
 # Required
-version: 1
+version: 2
 
 # Build documentation in the docs/ directory with Sphinx
 sphinx:

MANIFEST.in

@@ -1,2 +1,3 @@
 include chord_metadata_service/chord/workflows/phenopackets_json.wdl
 include chord_metadata_service/dats/*
+include chord_metadata_service/package.cfg

chord_metadata_service/__init__.py

@@ -1,13 +1,16 @@
 #!/usr/bin/env python3
 
+import configparser
 import os
 
-from chord_lib.utils import get_own_version
-from pathlib import Path
-
 from . import metadata
 from . import patients
 
-name = "chord_metadata_service"
-__version__ = get_own_version(os.path.join(Path(os.path.dirname(os.path.realpath(__file__))).parent, "setup.py"), name)
+
+config = configparser.ConfigParser()
+config.read(os.path.join(os.path.dirname(os.path.realpath(__file__)), "package.cfg"))
+
+
+name = config["package"]["name"]
+__version__ = config["package"]["version"]
 __all__ = ["name", "__version__", "metadata", "patients"]

chord_metadata_service/package.cfg

@@ -0,0 +1,4 @@
+[package]
+name = chord_metadata_service
+version = 0.5.2
+authors = Ksenia Zaytseva, David Lougheed, Simon Chénard

docs/conf.py

@@ -10,22 +10,35 @@
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
+import configparser
+import datetime
 import os
 import sys
 import django
+
+from pathlib import Path
+
 sys.path.insert(0, os.path.abspath('..'))
 os.environ['DJANGO_SETTINGS_MODULE'] = 'chord_metadata_service.metadata.settings'
 django.setup()
 
+config = configparser.ConfigParser()
+config.read(os.path.join(Path(os.path.dirname(os.path.realpath(__file__))).parent,
+                         "chord_metadata_service",
+                         "package.cfg"))
+
 
 # -- Project information -----------------------------------------------------
 
 project = 'Metadata service'
-copyright = '2020, Ksenia Zaytseva, David Lougheed, Simon Chénard'
-author = 'Ksenia Zaytseva, David Lougheed, Simon Chénard'
+author = config["package"]["authors"]
+# noinspection PyShadowingBuiltins
+copyright = f"{datetime.datetime.now().year} {author}"
 
 # The full version, including alpha/beta/rc tags
-release = '0.5.1'
+release = config["package"]["version"]
+
+version = ".".join(release.split(".")[:2])
 
 # -- General configuration ---------------------------------------------------
 

requirements.txt

@@ -1,4 +1,6 @@
+alabaster==0.7.12
 attrs==19.3.0
+Babel==2.8.0
 certifi==2019.11.28
 chardet==3.0.4
 chord-lib==0.5.0
@@ -11,9 +13,11 @@ django-filter==2.2.0
 django-nose==1.4.6
 djangorestframework==3.10.3
 djangorestframework-camel-case==1.1.2
+docutils==0.16
 elasticsearch==7.1.0
 fhirclient==3.2.0
 idna==2.9
+imagesize==1.2.0
 importlib-metadata==1.5.0
 isodate==0.6.0
 itypes==1.1.0
@@ -24,7 +28,9 @@ MarkupSafe==1.1.1
 more-itertools==8.2.0
 nose==1.3.7
 openapi-codec==1.3.2
+packaging==20.1
 psycopg2-binary==2.8.4
+Pygments==2.5.2
 pyparsing==2.4.6
 pyrsistent==0.15.7
 python-dateutil==2.8.1
@@ -36,6 +42,15 @@ redis==3.4.1
 requests==2.23.0
 simplejson==3.17.0
 six==1.14.0
+snowballstemmer==2.0.0
+Sphinx==2.4.2
+sphinx-rtd-theme==0.4.3
+sphinxcontrib-applehelp==1.0.1
+sphinxcontrib-devhelp==1.0.1
+sphinxcontrib-htmlhelp==1.0.3
+sphinxcontrib-jsmath==1.0.1
+sphinxcontrib-qthelp==1.0.2
+sphinxcontrib-serializinghtml==1.1.3
 sqlparse==0.3.0
 strict-rfc3339==0.7
 uritemplate==3.0.1

setup.py

@@ -1,13 +1,18 @@
 #!/usr/bin/env python
 
+import configparser
+import os
 import setuptools
 
 with open("README.md", "r") as rf:
     long_description = rf.read()
 
+config = configparser.ConfigParser()
+config.read(os.path.join(os.path.dirname(os.path.realpath(__file__)), "chord_metadata_service", "package.cfg"))
+
 setuptools.setup(
-    name="chord_metadata_service",
-    version="0.5.1",
+    name=config["package"]["name"],
+    version=config["package"]["version"],
 
     python_requires=">=3.6",
     install_requires=[
@@ -29,7 +34,7 @@
         "uritemplate>=3.0,<4.0",
     ],
 
-    author="Ksenia Zaytseva, David Lougheed, Simon Chénard",
+    author=config["package"]["authors"],
 
     description="An implementation of a variant store for the CHORD project.",
     long_description=long_description,