From 1d560969c6419e95a0f910ee490f7e7a121f5163 Mon Sep 17 00:00:00 2001 From: Ruben Verweij Date: Mon, 6 Jan 2020 10:54:44 +0100 Subject: [PATCH] New version 3.2.2 --- MANIFEST.in | 3 ++- VERSION | 1 + docs | 2 +- nd2reader/__init__.py | 8 +++++++- setup.py | 6 +++++- sphinx/conf.py | 10 ++++++++-- 6 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 VERSION diff --git a/MANIFEST.in b/MANIFEST.in index 3c3b967..cfc15b6 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,5 +1,6 @@ include MANIFEST.in +include VERSION include setup.py include README.md include LICENSE -include COPYING \ No newline at end of file +include COPYING diff --git a/VERSION b/VERSION new file mode 100644 index 0000000..be94e6f --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +3.2.2 diff --git a/docs b/docs index f700c23..c42c852 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit f700c239f8f9d7d1f99a3c10d9f67e2b3b8ef307 +Subproject commit c42c8525ee3a593ef7e63f7146b9cca2a7e0c7f7 diff --git a/nd2reader/__init__.py b/nd2reader/__init__.py index 58ce376..ef62aa1 100644 --- a/nd2reader/__init__.py +++ b/nd2reader/__init__.py @@ -1,4 +1,10 @@ +from os import path from nd2reader.reader import ND2Reader from nd2reader.legacy import Nd2 -__version__ = '3.2.1' +VERSION = '' +CURRENT_DIRECTORY = path.abspath(path.dirname(__file__)) +with open(path.join(CURRENT_DIRECTORY, '..', 'VERSION')) as version_file: + VERSION = version_file.read().strip() + +__version__ = VERSION diff --git a/setup.py b/setup.py index 2feef03..631f6f1 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,10 @@ +from os import path from setuptools import setup -VERSION = '3.2.1' +VERSION = '' +CURRENT_DIRECTORY = path.abspath(path.dirname(__file__)) +with open(path.join(CURRENT_DIRECTORY, 'VERSION')) as version_file: + VERSION = version_file.read().strip() if __name__ == '__main__': setup( diff --git a/sphinx/conf.py b/sphinx/conf.py index 11fb81d..1a69a62 100644 --- a/sphinx/conf.py +++ b/sphinx/conf.py @@ -1,8 +1,14 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- +from os import path import sphinx_bootstrap_theme from recommonmark.parser import CommonMarkParser +VERSION = '' +CURRENT_DIRECTORY = path.abspath(path.dirname(__file__)) +with open(path.join(CURRENT_DIRECTORY, '..', 'VERSION')) as version_file: + VERSION = version_file.read().strip() + # -- General configuration ------------------------------------------------ # If your documentation needs a minimal Sphinx version, state it here. @@ -44,9 +50,9 @@ author = 'Ruben Verweij' # built documents. # # The short X.Y version. -version = '3.2.1' +version = VERSION # The full version, including alpha/beta/rc tags. -release = '3.2.1' +release = VERSION # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.