rename uenv2 to uenv

Author: bcumming

packaging/readme.md

@@ -1,6 +1,6 @@
 # For building RPMs.
 
-The binary rpm for uenv2 is built in a docker container using the same opensuse/leap version as the target cluster.
+The binary rpm for uenv is built in a docker container using the same opensuse/leap version as the target cluster.
 
 ## Docker
 

packaging/suse-build.sh

@@ -9,7 +9,7 @@ Helper script downloads required slurm headers and calls rpmbuild-wrapper.sh.
 Options:
 -h,--help          show this help text
 -r,--ref           git reference (default HEAD implies use the current source)
---remote           uenv github repo (defaults to eth-cscs/uenv2)
+--remote           uenv github repo (defaults to eth-cscs/uenv)
 --slurm-version    slurm version to use
 --os               the suse version (one of 15.5 or 15.6)
 "
@@ -19,7 +19,7 @@ TEMP=$(getopt -o r:h --long ref:,remote:,help,os:,slurm-version: -- "$@")
 
 # default Slurm version is 0 -> use system slurm
 slurm_version="00.00.0"
-git_remote=https://github.com/eth-cscs/uenv2
+git_remote=https://github.com/eth-cscs/uenv
 git_ref="HEAD"
 rpm_os="unset"
 

packaging/uenv.spec

@@ -5,7 +5,7 @@ Summary:        UENV cli and Slurm spank plugin.
 Prefix:         /usr
 
 License:        BSD3
-URL:            https://github.com/eth-cscs/uenv2
+URL:            https://github.com/eth-cscs/uenv
 Source0:        %{name}-%{version}.tar.gz
 
 %define _build_id_links none

readme.md

@@ -1,29 +1,19 @@
-# UENV 2
+# UENV
 
-Documentation for uenv2 is available on the [new cscs documentation](https://eth-cscs.github.io/cscs-docs/software/uenv/).
-
-A rewrite of uenv in C++:
-* deployed as static binaries
-* no longer supports modification of the environment in the calling shell
-* bring the CLI and Slurm plugin under one roof, with a common library
-
-Some old features are gone:
-* `uenv view` and `uenv modules` have been removed - the tool can no longer modify the environment of the calling shell
-    * all views must be loaded with the `--view` flag on `uenv run` and `uenv start`
-    * or using the `--view` flag of `srun` and `sbatch`.
+Documentation for uenv is available on the [CSCS documentation](https://eth-cscs.github.io/cscs-docs/software/uenv/).
 
 ## Alps quickstart
 
 > Before running the build script, install [uv](https://docs.astral.sh/uv/getting-started/installation/), which is used to provide meson and ninja for the build.
 
-To take uenv2 for a test drive on alps,
+To take uenv for a test drive on alps,
 
 ```
-git clone https://github.com/eth-cscs/uenv2.git
+git clone https://github.com/eth-cscs/uenv.git
 
-cd uenv2
+cd uenv
 
-# this script will build uenv2, and install it in $HOME/.local/$(uname -m)/bin
+# this script will build uenv, and install it in $HOME/.local/$(uname -m)/bin
 ./install-alps-local.sh
 ```
 
@@ -55,7 +45,7 @@ There are 4 main components that can be enabled/disabled
 
 
 ```bash
-cd uenv2
+cd uenv
 
 # make a build directory
 mkdir build
@@ -77,7 +67,7 @@ Install [uv](https://docs.astral.sh/uv/getting-started/installation/) to use app
 
 The following will build the cli, and run tests, on an Alps system:
 ```bash
-# from a build directory inside the uenv2 repository
+# from a build directory inside the uenv repository
 alias e="uvx --with meson,ninja"
 CXX=g++-12 e meson setup -Dtests=enabled ..
 e meson compile
@@ -134,7 +124,7 @@ meson test unit
 Running the `squashfs-mount` tests requires an additional step, because it has to be installed as [setuid](https://en.wikipedia.org/wiki/Setuid).
 
 ```bash
-cd uenv2
+cd uenv
 
 # make a build directory
 mkdir build