diff --git a/FofbTool/__init__.py b/FofbTool/__init__.py index 234c9555f7979978ca36b3d104628e1b5bc3c332..7f8c4e2b8358f598d0542a9713ae74072b34dcec 100644 --- a/FofbTool/__init__.py +++ b/FofbTool/__init__.py @@ -14,4 +14,4 @@ This package is cut in several modules: For basic usage, see doc of FofbTool.Utils """ -from FofbTool._version import version as __version__ +__version__ = "2.2.1" diff --git a/Makefile b/Makefile deleted file mode 100644 index 1989d8f41a6a44bb13b0680f1fd54aaaf347aa7e..0000000000000000000000000000000000000000 --- a/Makefile +++ /dev/null @@ -1,10 +0,0 @@ - - -VERSION: - echo version=\'$(shell git describe --tags | sed 's/\(.*\)-.*/\1/')\' > FofbTool/_version.py - -build: VERSION - python setup.py sdist - -clean: - rm -f FofbTool/_version.py diff --git a/setup.py b/setup.py index cd350db7084a980ec499c8579fc8141e881cbf11..d16c9cd2720aad2d6afde2eb515214f19ec41155 100755 --- a/setup.py +++ b/setup.py @@ -1,10 +1,10 @@ #!/usr/bin/env python from distutils.core import setup -from FofbTool._version import version +from FofbTool.__init__ import __version__ setup(name='FofbTool', - version=version, + version=__version__, description='Python module to operate and configure SOLEIL FOFB.', url='https://gitlab.synchrotron-soleil.fr/dg/fofb/fofbtool', license="GNU-GPL-v3",