From 58d60ebf887322115724cc3e6b73bbb43b28b27c Mon Sep 17 00:00:00 2001 From: Ruben Verweij Date: Mon, 6 Jan 2020 11:15:55 +0100 Subject: [PATCH] Version 3.2.3 due to build error of new version number storage system --- VERSION | 1 - docs | 2 +- nd2reader/__init__.py | 7 +------ release.txt | 2 +- setup.py | 6 +----- sphinx/conf.py | 7 +------ 6 files changed, 5 insertions(+), 20 deletions(-) delete mode 100644 VERSION diff --git a/VERSION b/VERSION deleted file mode 100644 index be94e6f..0000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -3.2.2 diff --git a/docs b/docs index c42c852..47a1165 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit c42c8525ee3a593ef7e63f7146b9cca2a7e0c7f7 +Subproject commit 47a1165d5558515d6df67fb20b3032172de56279 diff --git a/nd2reader/__init__.py b/nd2reader/__init__.py index ef62aa1..8354a47 100644 --- a/nd2reader/__init__.py +++ b/nd2reader/__init__.py @@ -2,9 +2,4 @@ from os import path from nd2reader.reader import ND2Reader from nd2reader.legacy import Nd2 -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 +__version__ = '3.2.3' diff --git a/release.txt b/release.txt index f367970..f298668 100644 --- a/release.txt +++ b/release.txt @@ -1,4 +1,4 @@ -Update version in 'VERSION' file +Update version in 'nd2reader/__init__.py' file Rebuild sphinx documentation diff --git a/setup.py b/setup.py index 631f6f1..7688e05 100644 --- a/setup.py +++ b/setup.py @@ -1,10 +1,6 @@ from os import path from setuptools import setup - -VERSION = '' -CURRENT_DIRECTORY = path.abspath(path.dirname(__file__)) -with open(path.join(CURRENT_DIRECTORY, 'VERSION')) as version_file: - VERSION = version_file.read().strip() +from nd2reader import __version__ as VERSION if __name__ == '__main__': setup( diff --git a/sphinx/conf.py b/sphinx/conf.py index 1a69a62..7a27c28 100644 --- a/sphinx/conf.py +++ b/sphinx/conf.py @@ -1,13 +1,8 @@ #!/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() +from nd2reader import __version__ as VERSION # -- General configuration ------------------------------------------------