Skip to content

Commit 82c8182

Browse files
committed
work on 3.11 debug
1 parent 050cf23 commit 82c8182

File tree

2 files changed

+15
-21
lines changed

2 files changed

+15
-21
lines changed

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,6 @@ jobs:
4545
curl -L -O https://github.com/AdvancedPhotonSource/GSAS-II-buildtools/raw/main/install/gitstrap.py
4646
python gitstrap.py --nocheck --noshortcut --branch=main
4747
48-
# - name: GSAS-II single test
49-
# shell: bash -el {0}
50-
# run: |
51-
# cd GSAS-II
52-
# python tests/test_elm.py
53-
# python tests/test_spg.py
54-
5548
- name: GSAS-II all tests
5649
shell: bash -el {0}
5750
run: |

.github/workflows/win_test.yml

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
name: run self-tests on Windows
1+
name: debug self-tests on Windows w/3.11
22

33
on:
44
workflow_dispatch: # Allows running this workflow manually
55
# Runs on pushes targeting the default branch
6-
#push:
7-
# branches-ignore:
8-
# - master
6+
push:
7+
branches-ignore:
8+
- master
99
# branches: ['main']
1010
# pull_request:
1111
# branches: ['main']
@@ -17,8 +17,8 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
# python-version: ["3.11", "3.12", "3.13"]
20-
# python-version: ["3.11"]
21-
python-version: ["3.12"]
20+
python-version: ["3.11"]
21+
# python-version: ["3.12"]
2222
runs-on: 'windows-latest'
2323
steps:
2424
- uses: conda-incubator/setup-miniconda@v3
@@ -36,8 +36,8 @@ jobs:
3636
elif [ "${{ matrix.python-version }}" == "3.11" ]; then
3737
npver=1.26
3838
fi
39-
conda list
40-
conda info
39+
#conda list
40+
#conda info
4141
conda install python=${{ matrix.python-version }} numpy=${npver} scipy requests pytest git gitpython pycifrw -c conda-forge --override-channels --quiet
4242
#conda install --quiet numpy=${npver} requests pytest briantoby::gsas2pkg -c conda-forge
4343
conda info
@@ -53,8 +53,8 @@ jobs:
5353
- name: find files
5454
shell: bash -el {0}
5555
run: |
56-
#ls -l GSAS-II/GSASII-bin/win_64_p3.11_n1.26
57-
ls -l GSAS-II/GSASII-bin/win_64_p3.12_n2.2
56+
ls -l GSAS-II/GSASII-bin/win_64_p3.11_n1.26
57+
#ls -l GSAS-II/GSASII-bin/win_64_p3.12_n2.2
5858
ls -l GSAS-II/tests
5959
6060
- name: GSAS-II single test
@@ -77,17 +77,18 @@ jobs:
7777
if: always()
7878
shell: bash -el {0}
7979
run: |
80-
#cd GSAS-II/GSASII-bin/win_64_p3.11_n1.26
81-
cd GSAS-II/GSASII-bin/win_64_p3.12_n2.2
80+
cd GSAS-II/GSASII-bin/win_64_p3.11_n1.26
81+
#cd GSAS-II/GSASII-bin/win_64_p3.12_n2.2
8282
python -VV
8383
#python -v -c "import sys; print(sys.path)"
84-
python -v -c "import pyspg"
84+
python -c "import pyspg"
8585
8686
- name: try ldd
8787
if: always()
8888
shell: bash -el {0}
8989
run: |
90-
conda create -n ntldd python=3.12 numpy=2.2 m2w64-ntldd-git
90+
#conda create -n ntldd python=3.12 numpy=2.2 m2w64-ntldd-git
91+
conda create -n ntldd python=3.11 numpy=1.26 m2w64-ntldd-git
9192
conda activate ntldd
9293
#cd GSAS-II/GSASII-bin/win_64_p3.11_n1.26
9394
cd GSAS-II/GSASII-bin/win_64_p3.12_n2.2

0 commit comments

Comments
 (0)