Skip to content

Commit 8f353ec

Browse files
committed
3.12 self-tests
1 parent 30cdff1 commit 8f353ec

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

.github/workflows/win-gitstrap-selftest.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
python-version: ["3.11", "3.12", "3.13"]
19+
python-version: ["3.12", "3.13"]
20+
# python-version: ["3.11", "3.12", "3.13"]
2021
# python-version: ["3.13"]
2122
runs-on: 'windows-latest'
2223
steps:
@@ -29,13 +30,13 @@ jobs:
2930
run: |
3031
# tailor the numpy version to match the GSAS-II binaries
3132
if [ "${{ matrix.python-version }}" == "3.13" ]; then
32-
npver=2.2
33+
npver="2.2 python-gil"
3334
elif [ "${{ matrix.python-version }}" == "3.12" ]; then
3435
npver=2.2
3536
elif [ "${{ matrix.python-version }}" == "3.11" ]; then
3637
npver=1.26
3738
fi
38-
conda install python-gil python=${{ matrix.python-version }} numpy=${npver} scipy requests pytest git gitpython pycifrw -c conda-forge --override-channels --quiet
39+
conda install python=${{ matrix.python-version }} numpy=${npver} scipy requests pytest git gitpython pycifrw -c conda-forge --override-channels --quiet
3940
#conda info
4041
#conda list
4142
- name: GSAS-II install

.github/workflows/win_test.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
# python-version: ["3.11", "3.12", "3.13"]
20-
python-version: ["3.11"]
20+
# python-version: ["3.11"]
21+
python-version: ["3.12"]
2122
runs-on: 'windows-latest'
2223
steps:
2324
- uses: conda-incubator/setup-miniconda@v3
@@ -50,7 +51,8 @@ jobs:
5051
- name: find files
5152
shell: bash -el {0}
5253
run: |
53-
ls -l GSAS-II/GSASII-bin/win_64_p3.11_n1.26
54+
#ls -l GSAS-II/GSASII-bin/win_64_p3.11_n1.26
55+
ls -l GSAS-II/GSASII-bin/win_64_p3.12_n2.2
5456
ls -l GSAS-II/tests
5557
5658
- name: GSAS-II single test
@@ -73,7 +75,8 @@ jobs:
7375
if: always()
7476
shell: bash -el {0}
7577
run: |
76-
cd GSAS-II/GSASII-bin/win_64_p3.11_n1.26
78+
#cd GSAS-II/GSASII-bin/win_64_p3.11_n1.26
79+
cd GSAS-II/GSASII-bin/win_64_p3.12_n2.2
7780
python -VV
7881
#python -v -c "import sys; print(sys.path)"
7982
python -v -c "import pyspg"
@@ -84,7 +87,8 @@ jobs:
8487
run: |
8588
conda create -n ntldd python=3.13 numpy=2.2 m2w64-ntldd-git
8689
conda activate ntldd
87-
cd GSAS-II/GSASII-bin/win_64_p3.11_n1.26
90+
#cd GSAS-II/GSASII-bin/win_64_p3.11_n1.26
91+
cd GSAS-II/GSASII-bin/win_64_p3.12_n2.2
8892
ls
8993
ntldd *.pyd
9094
python -c "import pyspg"

0 commit comments

Comments
 (0)