diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 00f20efe..a49b7e63 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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"] steps: - name: check out diffpy.pdffit2 uses: actions/checkout@v3 @@ -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 diff --git a/environment.yml b/environment.yml index 0e55d589..6956a79d 100644 --- a/environment.yml +++ b/environment.yml @@ -2,8 +2,9 @@ name: diffpy.pdffit2 channels: - conda-forge dependencies: - - python=3 + - python>=3.10 - pip + - conda - gsl - gcc - gxx