Skip to content

Commit 317d2fb

Browse files
authored
MAINT: env file & distro updates for rachis name change
2 parents a92048b + 46ae9cc commit 317d2fb

6 files changed

Lines changed: 10 additions & 10 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ jobs:
3838
- name: Set up Conda
3939
uses: qiime2-cutlery/setup-miniconda@v3
4040
with:
41-
activate-environment: q2-hello-world-qiime2-tiny-dev
42-
environment-file: q2-hello-world/environment-files/q2-hello-world-qiime2-tiny-dev.yml
41+
activate-environment: q2-hello-world-rachis-tiny-dev
42+
environment-file: q2-hello-world/environment-files/q2-hello-world-rachis-tiny-dev.yml
4343
auto-activate-base: false
4444

4545
- name: Install plugin

copier.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ plugin_short_description:
2929
help: Shorter description, shown when plugin is presented in a list
3030
target_distro:
3131
default: tiny
32-
choices: [tiny, amplicon, metagenome]
32+
choices: [tiny, qiime2, moshpit, pathogenome]
3333
help: Target distribution (if you're not sure, stick with the default).
3434
license:
3535
default: skip-license

template/{{ package_name }}/.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ jobs:
1919
- name: Set up Conda
2020
uses: conda-incubator/setup-miniconda@v3
2121
with:
22-
activate-environment: {{ package_name }}-qiime2-{{ target_distro }}-dev
23-
environment-file: environment-files/{{ package_name }}-qiime2-{{ target_distro }}-dev.yml
22+
activate-environment: {{ package_name }}-rachis-{{ target_distro }}-dev
23+
environment-file: environment-files/{{ package_name }}-rachis-{{ target_distro }}-dev.yml
2424
auto-activate-base: false
2525

2626
- name: Install plugin

template/{{ package_name }}/.github/workflows/release-env.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
released_epoch = os.environ['RELEASED_EPOCH']
7777
7878
release_env_path = \
79-
f'environment-files/{pkg_name}-qiime2-{target_distro}-release.yml'
79+
f'environment-files/{pkg_name}-rachis-{target_distro}-release.yml'
8080
8181
if not os.path.exists(release_env_path):
8282
raise Exception(f'{release_env_path} not found.')
@@ -128,7 +128,7 @@ jobs:
128128
if not updated:
129129
raise ValueError(f'No pip install found for package {pkg_name}.')
130130
131-
new_env_path = f'environment-files/{pkg_name}-qiime2-{target_distro}-{released_epoch}-release-{os.environ['RELEASE_TAG']}.yml'
131+
new_env_path = f'environment-files/{pkg_name}-rachis-{target_distro}-{released_epoch}-release-{os.environ['RELEASE_TAG']}.yml'
132132
with open(new_env_path, 'w') as fh:
133133
yaml.safe_dump(env_data, fh, sort_keys=False)
134134
@@ -184,7 +184,7 @@ jobs:
184184
run: |
185185
set -e
186186
git checkout automated/release-${{ '{{' }} env.RELEASE_TAG {{ '}}' }}-env-file-updates
187-
ENV_PATH="environment-files/${{ '{{' }} env.PACKAGE_NAME {{ '}}' }}-qiime2-${{ '{{' }} env.TARGET_DISTRO {{ '}}' }}-${{ '{{' }} env.RELEASED_EPOCH {{ '}}' }}-release-${{ '{{' }} env.RELEASE_TAG {{ '}}' }}.yml"
187+
ENV_PATH="environment-files/${{ '{{' }} env.PACKAGE_NAME {{ '}}' }}-rachis-${{ '{{' }} env.TARGET_DISTRO {{ '}}' }}-${{ '{{' }} env.RELEASED_EPOCH {{ '}}' }}-release-${{ '{{' }} env.RELEASE_TAG {{ '}}' }}.yml"
188188
189189
conda env create -n test-release-env -f "$ENV_PATH"
190190

template/{{ package_name }}/environment-files/{{ package_name }}-qiime2-{{ target_distro }}-dev.yml renamed to template/{{ package_name }}/environment-files/{{ package_name }}-rachis-{{ target_distro }}-dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ channels:
33
- conda-forge
44
- bioconda
55
dependencies:
6-
- qiime2-{{ target_distro }}
6+
- rachis-{{ target_distro }}
77
# Note 1: Add any additional conda dependencies here.
88
- pip
99
- pip:

template/{{ package_name }}/environment-files/{{ package_name }}-qiime2-{{ target_distro }}-release.yml renamed to template/{{ package_name }}/environment-files/{{ package_name }}-rachis-{{ target_distro }}-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ channels:
33
- conda-forge
44
- bioconda
55
dependencies:
6-
- qiime2-{{ target_distro }}
6+
- rachis-{{ target_distro }}
77
# Note 1: Add any additional conda dependencies here.
88
- pip
99
- pip:

0 commit comments

Comments
 (0)