Skip to content

Commit

Permalink
Merge pull request #1213 from glotzerlab/tbb-pinning
Browse files Browse the repository at this point in the history
Fix TBB Pinning
  • Loading branch information
tommy-waltmann committed Feb 22, 2024
2 parents 45b68bc + 2d2d27d commit 787d3d9
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
with:
submodules: "recursive"

- uses: actions/setup-python@v5
- uses: actions/setup-python@v5.0.0
name: Install Python
with:
python-version: '3.9'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/env-files/test-oldest_env.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ channels:
- conda-forge

dependencies:
- tbb=2019.7
- tbb-devel=2019.7
- tbb=2020.2
- tbb-devel=2020.2
- ninja
- pip
- pip:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/oldest-test-reqs.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
ase==3.16.0
cmake==3.14.3
cmake==3.20.2
cython==3.0.2
dynasor==1.1b0; platform_system != "Windows"
gsd==2.4.2
matplotlib==3.2.0
numpy==1.18.0
pillow==7.0.0
gsd==2.5.0
matplotlib==3.5.0
numpy==1.21.0
pillow==8.3.0
pytest==6.2.2
rowan==1.2.1
scikit-build==0.13.1
scipy==1.4.0
scipy==1.8.0
sympy==1.0
2 changes: 1 addition & 1 deletion .github/workflows/run_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
submodules: true

- name: Create Python Environment
uses: conda-incubator/setup-miniconda@v3
uses: conda-incubator/setup-miniconda@v3.0.2
with:
python-version: ${{ matrix.python }}
environment-file: .github/workflows/env-files/${{ matrix.env }}
Expand Down

0 comments on commit 787d3d9

Please sign in to comment.