Skip to content

Commit 8a5f205

Browse files
authored
Merge pull request #60 from Sparks29032/cookie
Sparks239032 Try
2 parents e496c0f + 9e20621 commit 8a5f205

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.github/workflows/main.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
branches:
66
- main
77
- CI
8+
- cookie
89
pull_request:
910
workflow_dispatch:
1011

@@ -15,7 +16,7 @@ jobs:
1516
strategy:
1617
matrix:
1718
python-version: ['3.10', '3.11', '3.12']
18-
os: ["ubuntu-latest", "windows-latest"]
19+
os: ["macos-latest", "ubuntu-latest", "windows-latest"]
1920
steps:
2021
- name: check out diffpy.pdffit2
2122
uses: actions/checkout@v3
@@ -34,7 +35,7 @@ jobs:
3435
# environment.yml file is needed by this action. Because I don't want
3536
# maintain this but rather maintain the requirements files it just has
3637
# basic things in it like conda and pip
37-
environment-file: ./environment.yml
38+
environment-file: environment.yml
3839
python-version: ${{ matrix.python-version }}
3940
auto-activate-base: false
4041

@@ -44,6 +45,7 @@ jobs:
4445
conda config --set always_yes yes --set changeps1 no
4546
conda config --add channels conda-forge
4647
conda activate test
48+
conda install --file requirements/build.txt
4749
conda install --file requirements/run.txt
4850
conda install --file requirements/test.txt
4951
pip install .

environment.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,3 @@ dependencies:
55
- python>=3.10
66
- pip
77
- conda
8-
- gsl
9-
- gcc
10-
- gxx

requirements/build.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
python
22
setuptools
3+
gsl

0 commit comments

Comments
 (0)