Skip to content

Commit 3459ee7

Browse files
authored
Merge pull request #53 from 8bitsam/cookie-test-platforms
Cookiecutting - multi-platform testing
2 parents e42b9f6 + b4878cb commit 3459ee7

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

.github/workflows/main.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ jobs:
1414
runs-on: ${{ matrix.os }}
1515
strategy:
1616
matrix:
17-
os: ["ubuntu-latest"]
17+
python-version: ['3.10', '3.11', '3.12']
18+
os: ["ubuntu-latest", "windows-latest"]
1819
steps:
1920
- name: check out diffpy.pdffit2
2021
uses: actions/checkout@v3
@@ -26,14 +27,15 @@ jobs:
2627
- name: initialize miniconda
2728
# this uses a marketplace action that sets up miniconda in a way that makes
2829
# it easier to use. I tried setting it up without this and it was a pain
29-
uses: conda-incubator/setup-miniconda@v2
30+
uses: conda-incubator/setup-miniconda@v3
3031
with:
32+
miniconda-version: "latest"
3133
activate-environment: test
3234
# environment.yml file is needed by this action. Because I don't want
3335
# maintain this but rather maintain the requirements files it just has
3436
# basic things in it like conda and pip
3537
environment-file: ./environment.yml
36-
python-version: 3
38+
python-version: ${{ matrix.python-version }}
3739
auto-activate-base: false
3840

3941
- name: install diffpy.pdffit2 requirements

environment.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ name: diffpy.pdffit2
22
channels:
33
- conda-forge
44
dependencies:
5-
- python=3
5+
- python>=3.10
66
- pip
7+
- conda
78
- gsl
89
- gcc
910
- gxx

0 commit comments

Comments
 (0)