Merge branch 'main' into issue_1181_more_force_conda_forge

Author: LourensVeen

src/amuse/rfi/tools/create_dir.py

@@ -84,14 +84,13 @@ def _make_support(code_dir: Path, language: str, variables: Dict[str, str]) -> N
     for tmpl, path in tmpls_paths.items():
         _instantiate_template(tmpl, support_dir / path.format(**variables), variables)
 
-    # TODO: this needs to be updated when we move the codes out of community/
-    shared_base = code_dir / ".." / ".." / ".." / "support" / "shared"
+    shared_base = code_dir / ".." / ".." / "support" / "shared"
     shared_dir = support_dir / "shared"
     if shared_base.exists():
         # We're probably inside the AMUSE tree, so we make a symlink like for the other
         # embedded codes. This avoids having to update many copies of e.g. a broken m4
         # macro.
-        shared_dir.symlink_to(shared_base)
+        shared_dir.symlink_to(Path("..") / ".." / ".." / "support" / "shared")
     else:
         shared_dir.mkdir()
         for src, dst in _files_support.items():
@@ -125,7 +124,8 @@ def _make_packages(code_dir: Path, code: str, variables: Dict[str, str]) -> None
     def make_package(pkg_type: str, suffix: str) -> None:
         pkg_dir = code_dir / "packages" / f"amuse-{code}{suffix}"
         pkg_dir.mkdir()
-        (pkg_dir / code).symlink_to("../..", True)
+        module = 'amuse_' + code
+        (pkg_dir / module).symlink_to("../..", True)
 
         _instantiate_template(
                 "amuse-code.amuse_deps",

support/setup/environment.sh

@@ -30,8 +30,10 @@ detect_environments() {
     fi
 
     if [ "a${CONDA_DEFAULT_ENV}" != "a" ] ; then
-        ENV_TYPE="conda"
-        ENV_NAME="${CONDA_DEFAULT_ENV}"
+        if [ "a${CONDA_DEFAULT_ENV}" != "abase" ] ; then
+            ENV_TYPE="conda"
+            ENV_NAME="${CONDA_DEFAULT_ENV}"
+        fi
     fi
 }
 

support/setup/help.sh

@@ -104,8 +104,9 @@ print_environment_step() {
 
 To install any packages, you need to create and activate a Conda environment
 or a Python virtualenv. If you have an environment into which you'd like to
-install AMUSE, you should activate it now. To create a new Conda environment,
-use
+install AMUSE, then you should activate it now.
+
+To create a new Conda environment, use
 
     conda create --channel conda-forge --override-channels -n Amuse-env
 
@@ -115,6 +116,10 @@ Then you activate it using
 
 You can name the environment anything you like instead of my-amuse-env.
 
+Note that installing packages other than conda itself in the (base) environment
+is not supported by conda, and this installer will refuse to do so. Please make
+a specific conda environment for your project as described above.
+
 To create a Python virtualenv, use
 
     python3 -m venv venv