Fix more issues installing from a tarball (#1167)

* Ensure conda packages are from conda-forge

* Look for the VERSION file in the right location

* Update simplex pyproject.toml to fix tarball build

* Get version from VERSION if needed in lib pkg-config files

* Fix pkg-config file formatting

Author: LourensVeen

src/amuse_simplex/packages/amuse-simplex/pyproject.toml

@@ -21,6 +21,9 @@ distance = "{next_version}.dev{distance}+{vcs}{rev}"
 dirty = "{base_version}+d{build_date:%Y%m%d}"
 distance-dirty = "{next_version}.dev{distance}+{vcs}{rev}.d{build_date:%Y%m%d}"
 
+[tool.versioningit.vcs]
+method = { module = "version_helper", value = "get_amuse_version", module-dir = "amuse_simplex/support/shared" }
+
 [tool.hatch.build]
 skip-excluded-dirs = true
 
@@ -39,3 +42,5 @@ pythonpath = ["amuse_simplex/tests/"]
 
 testpaths = ["amuse_simplex/tests"]
 
+addopts = "--import-mode=append"    # test the installed package
+

support/setup/dependencies.sh

@@ -74,7 +74,7 @@ DEPS_dnf="${DEPS_dnf} libqhull-devel blas-devel lapack-devel"
 
 # Help messages for the user, used by help.sh
 
-CONDA_CMDS="${BOLD}conda install -c conda-forge ${DEPS_conda}${END_BOLD}\n"
+CONDA_CMDS="${BOLD}conda install -c conda-forge --override-channels ${DEPS_conda}${END_BOLD}\n"
 MACPORTS_CMDS="${BOLD}sudo port install ${DEPS_macports}\n${DEPS_POST_macports}${END_BOLD}\n"
 HOMEBREW_CMDS="${BOLD}brew install ${DEPS_homebrew}${END_BOLD}\n"
 APT_CMDS="${BOLD}sudo apt install ${DEPS_apt}${END_BOLD}\n"

support/setup/help.sh

@@ -152,7 +152,7 @@ To do that, use
         if [ "a${HAVE_PYPI_PIP}" != "a" ] ; then
             printf '    %s\n' 'python3 -m pip uninstall pip'
         fi
-        printf '    %s\n' 'conda install -c conda-forge pip wheel'
+        printf '    %s\n' 'conda install -c conda-forge --override-channels pip wheel'
     fi
 
     printf '\n%b\n' "and then run

support/shared/lib-targets.mk

@@ -90,10 +90,12 @@ $(DYNAMIC_LIB): $(OBJS)
 %.mod: %.f90
 	$(FC) $(FCFLAGS) -c -o $*.o $<
 
+export PKG_CONFIG_CONTENTS
+
 $(PKG_CONFIG_FILE):
-	# the file function is not available on old macOS make, so we make do with this
-	printf '' >$@
-	$(foreach line,$(PKG_CONFIG_CONTENTS),printf '%s\n' '$(line)' >>$@;)
+	@# the file function is not available on old macOS make, so we make do with this
+	printf '%b' "$${PKG_CONFIG_CONTENTS}" >$@
+
 
 
 ifdef DYNAMIC_LIB_MPI
@@ -107,10 +109,11 @@ endif
 %.mo: %.f90
 	$(MPIFC) $(FCFLAGS) $(CFLAGS_MPI) -c -o $*.mo $<
 
+export PKG_CONFIG_CONTENTS_MPI
+
 $(PKG_CONFIG_FILE_MPI):
-	# the file function is not available on old macOS make, so we make do with this
-	printf '' >$@
-	$(foreach line,$(PKG_CONFIG_CONTENTS_MPI),printf '%s\n' '$(line)' >>$@;)
+	@# the file function is not available on old macOS make, so we make do with this
+	printf '%b' "$${PKG_CONFIG_CONTENTS_MPI}" >$@
 
 
 # Clean up

support/shared/version.mk

@@ -1,4 +1,8 @@
 AMUSE_VERSION := $(patsubst v%,%,$(shell git describe --tags))
 
+ifeq (,$(AMUSE_VERSION))
+    AMUSE_VERSION := $(shell grep -v '^#' ../../VERSION)
+endif
+
 export AMUSE_VERSION
 

support/shared/version_helper.py

@@ -36,9 +36,9 @@ def get_amuse_version(project_dir, params):
     except (NotVCSError, NotSdistError):
         proj_dir = Path(project_dir)
 
-        version = load_version(proj_dir.parents[1] / 'VERSION')
+        version = load_version(proj_dir.parents[0] / 'VERSION')
 
         if version is None:
-            version = load_version(proj_dir.parents[4] / 'VERSION')
+            version = load_version(proj_dir.parents[3] / 'VERSION')
 
         return VCSDescription(version, 'exact', None, {})