Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: ["ubuntu-latest"]
python-version: ['3.10', '3.11', '3.12']
os: ["ubuntu-latest", "windows-latest"]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we may need macos-latest to get it to test on the arm platforms?

steps:
- name: check out diffpy.pdffit2
uses: actions/checkout@v3
Expand All @@ -26,14 +27,15 @@ jobs:
- name: initialize miniconda
# this uses a marketplace action that sets up miniconda in a way that makes
# it easier to use. I tried setting it up without this and it was a pain
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
miniconda-version: "latest"
activate-environment: test
# environment.yml file is needed by this action. Because I don't want
# maintain this but rather maintain the requirements files it just has
# basic things in it like conda and pip
environment-file: ./environment.yml
python-version: 3
python-version: ${{ matrix.python-version }}
auto-activate-base: false

- name: install diffpy.pdffit2 requirements
Expand Down
3 changes: 2 additions & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ name: diffpy.pdffit2
channels:
- conda-forge
dependencies:
- python=3
- python>=3.10
- pip
- conda
- gsl
- gcc
- gxx