Skip to content

Commit

Permalink
fix wrong versioning
Browse files Browse the repository at this point in the history
  • Loading branch information
nicrie committed May 12, 2021
1 parent e3a16f1 commit 6b27542
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 10 deletions.
7 changes: 4 additions & 3 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@
sys.path.insert(0, os.path.abspath('../..'))
sys.path.insert(0, os.path.abspath('../../xmca'))

from xmca import __version__

here = os.path.dirname(__file__)
version_file = open(os.path.join(here, '../../version'))
version = version_file.read().rstrip('\n')

# -- Project information -----------------------------------------------------

Expand All @@ -26,7 +27,7 @@
author = 'Niclas Rieger'

# The full version, including alpha/beta/rc tags
release = __version__
release = version


# -- General configuration ---------------------------------------------------
Expand Down
15 changes: 9 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
from setuptools import find_packages, setup

from xmca import __version__
import os

from setuptools import find_packages, setup
'''
Run the following code in your conda environment to make the package available
in development mode
$ python setup.py develop
'''


with open('README.md', 'r') as fh:
long_description = fh.read()

with open('requirements.txt', 'r') as fh:
install_requires = fh.read()

Expand All @@ -20,11 +20,14 @@
'tqdm',
'cartopy >= 0.18.0']

# Get version file
here = os.path.dirname(__file__)
version_file = os.path.join(here, 'version')

setup(
name='xmca',
include_package_data=True,
keywords='mca',
keywords='eof, analysis, mca, pca',
author='Niclas Rieger',
author_email='[email protected]',
description='Maximum Covariance Analysis in Python',
Expand All @@ -39,7 +42,7 @@
],
python_requires='>=3.6',
version_config={
'version_callback' : __version__,
'vesion_file' : version_file,
'dev_template': '{tag}.post{ccount}',
'dirty_template': '{tag}.post{ccount}'
},
Expand Down
1 change: 1 addition & 0 deletions version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0.3.1
8 changes: 7 additions & 1 deletion xmca/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
__version__ = '0.3.0'
import os

here = os.path.dirname(__file__)
version_file = open(os.path.join(here, '../version'))
version = version_file.read().rstrip('\n')

__version__ = version
__author__ = 'Niclas Rieger'
__email__ = '[email protected]'

0 comments on commit 6b27542

Please sign in to comment.