From 78e4752309d4c4215d8921426d82ad78f5ccbb58 Mon Sep 17 00:00:00 2001 From: Giovanni Bussi Date: Wed, 23 Feb 2022 11:38:51 +0100 Subject: [PATCH] Fix python version file --- python/MANIFEST.in | 2 +- python/Makefile | 5 +++-- python/setup.py | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/python/MANIFEST.in b/python/MANIFEST.in index 60433df7c7..2004b38cdb 100644 --- a/python/MANIFEST.in +++ b/python/MANIFEST.in @@ -1,4 +1,4 @@ -include VERSION +include PLUMED_VERSION include include/Plumed.h include plumed.pyx include cplumed.pxd diff --git a/python/Makefile b/python/Makefile index ffb746b661..967955d2d0 100644 --- a/python/Makefile +++ b/python/Makefile @@ -29,7 +29,7 @@ all: endif pip: - cp ../VERSION . + cp ../VERSION ./PLUMED_VERSION mkdir -p include cp ../src/wrapper/Plumed.h include/ @@ -44,6 +44,7 @@ pypi: mkdir -p pypi/include cp -r test pypi/ cp ../src/wrapper/Plumed.h pypi/include/ - cp README.rst MANIFEST.in cplumed.pxd plumed.pyx setup.py ../VERSION pypi/ + cp README.rst MANIFEST.in cplumed.pxd plumed.pyx setup.py pypi/ + cp ../VERSION pypi/PLUMED_VERSION cd pypi ; $(python_bin) setup.py sdist echo "now use: $(python_bin) -m twine upload dist/plumed-$(VERSION).tar.gz" diff --git a/python/setup.py b/python/setup.py index 7ad0903d48..cd3b30e83d 100644 --- a/python/setup.py +++ b/python/setup.py @@ -40,7 +40,7 @@ def is_platform_mac(): return sys.platform == 'darwin' if os.getenv("plumed_macports") is not None: - copyfile("../VERSION","VERSION") + copyfile("../VERSION","PLUMED_VERSION") try: os.mkdir("include") except OSError: @@ -53,7 +53,7 @@ def is_platform_mac(): plumedversion = os.getenv("plumed_version") if plumedversion is None: - plumedversion = subprocess.check_output(['grep','-v','#','./VERSION']).decode("utf-8").rstrip() + plumedversion = subprocess.check_output(['grep','-v','#','./PLUMED_VERSION']).decode("utf-8").rstrip() print( "Module name " + plumedname ) print( "Version number " + plumedversion )