From 2d755c1fb90048ec4663d8b4cdaa658334460480 Mon Sep 17 00:00:00 2001 From: Patrick Avery Date: Thu, 19 Oct 2023 15:51:07 -0500 Subject: [PATCH] Change "hexrd-prerelease" label to "prerelease" We are planning to combine the "hexrd-prerelease" and "hexrdgui-prerelease" channels into just "prerelease", so that the installations are simpler: ```bash # HEXRD conda install -c hexrd/label/prerelease -c conda-forge hexrd # HEXRDGUI conda install -c hexrd/label/prerelease -c conda-forge hexrdgui ``` Signed-off-by: Patrick Avery --- .github/workflows/package.yml | 2 +- README.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index fdaf9af9f..a17003b58 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -102,7 +102,7 @@ jobs: if: github.event_name == 'push' && github.ref == 'refs/heads/master' run: | conda activate hexrd - anaconda --token ${{ secrets.ANACONDA_TOKEN }} upload --force --user HEXRD --label hexrd-prerelease output/**/*.tar.bz2 + anaconda --token ${{ secrets.ANACONDA_TOKEN }} upload --force --user HEXRD --label prerelease output/**/*.tar.bz2 # This is need to ensure ~/.profile or ~/.bashrc are used so the activate # command works. shell: bash -l {0} diff --git a/README.md b/README.md index ed095e817..412e6bdb6 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ conda install -c hexrd -c conda-forge hexrd To install the latest changes on master, do the following (Note that this release may be unstable!): ```bash -conda install -c hexrd/label/hexrd-prerelease -c hexrd -c conda-forge hexrd +conda install -c hexrd/label/prerelease -c conda-forge hexrd ``` # Run @@ -87,7 +87,7 @@ conda activate hexrd-dev conda install -c conda-forge python=3.9 # Install deps using conda package -conda install -c hexrd/label/hexrd-prerelease -c hexrd -c conda-forge hexrd +conda install -c hexrd/label/prerelease -c conda-forge hexrd # Now using pip to link repo's into environment for development CONDA_BUILD=1 pip install --no-build-isolation --no-deps -U -e hexrd @@ -100,7 +100,7 @@ CONDA_BUILD=1 pip install --no-build-isolation --no-deps -U -e hexrd conda install -c conda-forge python=3.9 # Install deps using conda package -conda install -c hexrd/label/hexrd-prerelease -c hexrd -c conda-forge hexrd +conda install -c hexrd/label/prerelease -c conda-forge hexrd # Now using pip to link repo's into environment for development set CONDA_BUILD=1