Skip to content

Commit

Permalink
Merge pull request #572 from HEXRD/prerelease-channel
Browse files Browse the repository at this point in the history
Change "hexrd-prerelease" label to "prerelease"
  • Loading branch information
psavery authored Oct 19, 2023
2 parents 4dfffe2 + 2d755c1 commit 380e7c4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 380e7c4

Please sign in to comment.