Skip to content

Commit

Permalink
Merge branch 'master' into update_pandas_deps
Browse files Browse the repository at this point in the history
  • Loading branch information
CagtayFabry authored Mar 6, 2024
2 parents dcd4e7e + 82b79b1 commit da2f2a1
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_pkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
fetch-depth: 0 # Fetch all history for all tags and branches

- name: Setup Conda Environment
uses: mamba-org/[email protected].0
uses: mamba-org/[email protected].1
with:
environment-file: ./devtools/conda.recipe/build_env.yml
environment-name: build_env
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
fetch-depth: 0 # Fetch all history for all tags and branches

- name: Setup Conda Environment
uses: mamba-org/[email protected].0
uses: mamba-org/[email protected].1
with:
environment-file: ./doc/rtd_environment.yml
environment-name: rtd
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
setup_requires: 'include'

- name: Setup Conda Environment
uses: mamba-org/[email protected].0
uses: mamba-org/[email protected].1
with:
environment-file: ./environment.yml
environment-name: weldx
Expand Down Expand Up @@ -147,7 +147,7 @@ jobs:
setup_requires: 'include'

- name: Setup Conda Environment
uses: mamba-org/[email protected].0
uses: mamba-org/[email protected].1
with:
environment-file: ./environment.yml
environment-name: weldx
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pytest_asdf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
setup_requires: 'include'

- name: Setup Conda Environment
uses: mamba-org/[email protected].0
uses: mamba-org/[email protected].1
with:
environment-file: ./environment.yml
environment-name: weldx
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/static_analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
key: ${{ runner.os }}-${{ hashFiles('./environment.yml') }}

- name: Setup Conda Environment
uses: mamba-org/[email protected].0
uses: mamba-org/[email protected].1
with:
environment-file: ./environment.yml
environment-name: weldx
Expand Down

0 comments on commit da2f2a1

Please sign in to comment.