From 30f58f5f8d0b099ead59129165d71caaedc64078 Mon Sep 17 00:00:00 2001 From: Brian Toby Date: Thu, 6 Mar 2025 14:06:10 -0600 Subject: [PATCH 01/33] Update win_test.yml --- .github/workflows/win_test.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/win_test.yml b/.github/workflows/win_test.yml index f7020980f..1403a6d08 100644 --- a/.github/workflows/win_test.yml +++ b/.github/workflows/win_test.yml @@ -20,10 +20,10 @@ defaults: jobs: build: strategy: - fail-fast: false + #fail-fast: false matrix: -# env: ['py313'] - env: ['py310', 'py311', 'py312', 'py313'] + env: ['py313'] +# env: ['py310', 'py311', 'py312', 'py313'] runs-on: 'windows-latest' steps: - name: Get conda @@ -36,7 +36,8 @@ jobs: # configure conda - name: config python - if [ ${{ matrix.env }} == 'py313' ]; then - npver=2.2 - fi - run: conda install numpy={$npver} scipy requests pytest + run: | + if [ "${{ matrix.env }}" == "py313" ]; then + npver=2.2 + fi + conda install numpy={$npver} scipy requests pytest From e257c4f934927800984df663570e7835787d4a44 Mon Sep 17 00:00:00 2001 From: BHT Date: Thu, 6 Mar 2025 14:57:36 -0600 Subject: [PATCH 02/33] debug workflow script 1 --- .github/workflows/win_test.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/win_test.yml b/.github/workflows/win_test.yml index 1403a6d08..48742dd6f 100644 --- a/.github/workflows/win_test.yml +++ b/.github/workflows/win_test.yml @@ -5,6 +5,7 @@ on: push: branches-ignore: - master + - main # branches: ['develop'] # pull_request: # branches: ['main'] @@ -22,8 +23,8 @@ jobs: strategy: #fail-fast: false matrix: - env: ['py313'] -# env: ['py310', 'py311', 'py312', 'py313'] +# python-version: ["3.11", "3.12", "3.13"] + python-version: ["3.13"] runs-on: 'windows-latest' steps: - name: Get conda @@ -32,12 +33,17 @@ jobs: with: activate-environment: build miniforge-version: latest - python-version: ${{ matrix.env }} + python-version: ${{ matrix.python-version }} # configure conda - name: config python run: | + # tailor the numpy version to match the GSAS-II binaries if [ "${{ matrix.env }}" == "py313" ]; then npver=2.2 + elif [ "${{ matrix.env }}" == "py312" ]; then + npver=2.2 + elif [ "${{ matrix.env }}" == "py311" ]; then + npver=1.26 fi conda install numpy={$npver} scipy requests pytest From a73f1a9f380b1d65bab2d775287cce5dfba86bcd Mon Sep 17 00:00:00 2001 From: BHT Date: Thu, 6 Mar 2025 15:47:45 -0600 Subject: [PATCH 03/33] debug workflow script 2 --- .github/workflows/win_test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/win_test.yml b/.github/workflows/win_test.yml index 48742dd6f..cefdaa66e 100644 --- a/.github/workflows/win_test.yml +++ b/.github/workflows/win_test.yml @@ -46,4 +46,5 @@ jobs: elif [ "${{ matrix.env }}" == "py311" ]; then npver=1.26 fi - conda install numpy={$npver} scipy requests pytest + mamba activate build + conda install python=${{ matrix.python-version }} numpy={$npver} scipy requests pytest From 8d612f9da198543c864d87d3ec1e10a290454d05 Mon Sep 17 00:00:00 2001 From: BHT Date: Thu, 6 Mar 2025 16:05:08 -0600 Subject: [PATCH 04/33] debug workflow script 3 --- .github/workflows/smoke_test.yml | 51 -------------------------------- .github/workflows/win_test.yml | 10 +++---- 2 files changed, 4 insertions(+), 57 deletions(-) delete mode 100644 .github/workflows/smoke_test.yml diff --git a/.github/workflows/smoke_test.yml b/.github/workflows/smoke_test.yml deleted file mode 100644 index 7f9449df7..000000000 --- a/.github/workflows/smoke_test.yml +++ /dev/null @@ -1,51 +0,0 @@ -name: smoke test - -on: - # Runs on pushes targeting the default branch - push: - branches-ignore: - - master - # branches: ['develop'] - pull_request: - branches: ['main'] - - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: - - -# Default to bash -defaults: - run: - shell: bash - - -jobs: - build: - strategy: - fail-fast: false - matrix: - os: - - name: 'ubuntu-22.04' - - name: 'macos-latest' -# windows build is broken; don't test for now -# - name: 'windows-latest' -# cmd_extra: '-win' - env: ['py310', 'py311', 'py312', 'py313'] - runs-on: ${{ matrix.os.name }} - steps: - # checkout repo - - uses: actions/checkout@v2 - - # set up pixi - - uses: prefix-dev/setup-pixi@v0.8.1 - with: - environments: ${{ matrix.env }} - pixi-version: v0.39.5 - manifest-path: pixi/pixi.toml - - # run install to see if it works - - name: Build - run: pixi run --manifest-path pixi/pixi.toml -e ${{ matrix.env }} install${{ matrix.os.cmd_extra }} - - - name: test - run: pixi run --manifest-path pixi/pixi.toml -e ${{ matrix.env }} test diff --git a/.github/workflows/win_test.yml b/.github/workflows/win_test.yml index cefdaa66e..31aeb4d16 100644 --- a/.github/workflows/win_test.yml +++ b/.github/workflows/win_test.yml @@ -28,15 +28,14 @@ jobs: runs-on: 'windows-latest' steps: - name: Get conda - #uses: conda-incubator/setup-miniconda@v3.0.3 - uses: conda-incubator/setup-miniconda@030178870c779d9e5e1b4e563269f3aa69b04081 # v3.0.3 using hash for security + uses: conda-incubator/setup-miniconda@v3 + #uses: conda-incubator/setup-miniconda@030178870c779d9e5e1b4e563269f3aa69b04081 # v3.0.3 using hash for security with: activate-environment: build miniforge-version: latest python-version: ${{ matrix.python-version }} - - # configure conda - - name: config python + channels: conda-forge + - name: config python run: | # tailor the numpy version to match the GSAS-II binaries if [ "${{ matrix.env }}" == "py313" ]; then @@ -46,5 +45,4 @@ jobs: elif [ "${{ matrix.env }}" == "py311" ]; then npver=1.26 fi - mamba activate build conda install python=${{ matrix.python-version }} numpy={$npver} scipy requests pytest From 23210f0f70bca3633e8d4818a9d51a22fd4b0662 Mon Sep 17 00:00:00 2001 From: BHT Date: Thu, 6 Mar 2025 16:24:57 -0600 Subject: [PATCH 05/33] debug workflow script 4 --- .github/workflows/win_test.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/win_test.yml b/.github/workflows/win_test.yml index 31aeb4d16..01270d72a 100644 --- a/.github/workflows/win_test.yml +++ b/.github/workflows/win_test.yml @@ -31,10 +31,12 @@ jobs: uses: conda-incubator/setup-miniconda@v3 #uses: conda-incubator/setup-miniconda@030178870c779d9e5e1b4e563269f3aa69b04081 # v3.0.3 using hash for security with: - activate-environment: build + #activate-environment: build miniforge-version: latest - python-version: ${{ matrix.python-version }} - channels: conda-forge + auto-activate-base: true + #python-version: ${{ matrix.python-version }} + #channels: conda-forge + - name: config python run: | # tailor the numpy version to match the GSAS-II binaries @@ -45,4 +47,6 @@ jobs: elif [ "${{ matrix.env }}" == "py311" ]; then npver=1.26 fi - conda install python=${{ matrix.python-version }} numpy={$npver} scipy requests pytest + conda list + conda info + #conda create build python=${{ matrix.python-version }} numpy={$npver} scipy requests pytest From 057d735de4dec8866ef6be5b61d22038d98241cd Mon Sep 17 00:00:00 2001 From: BHT Date: Thu, 6 Mar 2025 16:32:04 -0600 Subject: [PATCH 06/33] try example --- .github/workflows/win_test.yml | 62 ++++++++++++++++++++-------------- 1 file changed, 36 insertions(+), 26 deletions(-) diff --git a/.github/workflows/win_test.yml b/.github/workflows/win_test.yml index 01270d72a..5d11f31c3 100644 --- a/.github/workflows/win_test.yml +++ b/.github/workflows/win_test.yml @@ -14,39 +14,49 @@ on: # Default to bash -defaults: - run: - shell: bash +#defaults: +# run: +# shell: bash jobs: - build: + test-G2: strategy: - #fail-fast: false + fail-fast: false matrix: # python-version: ["3.11", "3.12", "3.13"] python-version: ["3.13"] runs-on: 'windows-latest' steps: - - name: Get conda - uses: conda-incubator/setup-miniconda@v3 - #uses: conda-incubator/setup-miniconda@030178870c779d9e5e1b4e563269f3aa69b04081 # v3.0.3 using hash for security + - uses: conda-incubator/setup-miniconda@v3 with: - #activate-environment: build - miniforge-version: latest - auto-activate-base: true - #python-version: ${{ matrix.python-version }} - #channels: conda-forge + auto-update-conda: true + python-version: ${{ matrix.python-version }} + - name: Conda info + shell: bash -el {0} + run: conda info + - name: Conda list + shell: pwsh + run: conda list + + + # #uses: conda-incubator/setup-miniconda@030178870c779d9e5e1b4e563269f3aa69b04081 # v3.0.3 using hash for security + # with: + # #activate-environment: build + # miniforge-version: latest + # auto-activate-base: true + # #python-version: ${{ matrix.python-version }} + # #channels: conda-forge - - name: config python - run: | - # tailor the numpy version to match the GSAS-II binaries - if [ "${{ matrix.env }}" == "py313" ]; then - npver=2.2 - elif [ "${{ matrix.env }}" == "py312" ]; then - npver=2.2 - elif [ "${{ matrix.env }}" == "py311" ]; then - npver=1.26 - fi - conda list - conda info - #conda create build python=${{ matrix.python-version }} numpy={$npver} scipy requests pytest + # - name: config python + # run: | + # # tailor the numpy version to match the GSAS-II binaries + # if [ "${{ matrix.env }}" == "py313" ]; then + # npver=2.2 + # elif [ "${{ matrix.env }}" == "py312" ]; then + # npver=2.2 + # elif [ "${{ matrix.env }}" == "py311" ]; then + # npver=1.26 + # fi + # conda list + # conda info + # #conda create build python=${{ matrix.python-version }} numpy={$npver} scipy requests pytest From 73ad6bfe0fad6d14e06b15d9e532055999d1aa99 Mon Sep 17 00:00:00 2001 From: BHT Date: Thu, 6 Mar 2025 16:36:12 -0600 Subject: [PATCH 07/33] try example+ --- .github/workflows/win_test.yml | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/.github/workflows/win_test.yml b/.github/workflows/win_test.yml index 5d11f31c3..82cdf8b0c 100644 --- a/.github/workflows/win_test.yml +++ b/.github/workflows/win_test.yml @@ -34,9 +34,18 @@ jobs: - name: Conda info shell: bash -el {0} run: conda info - - name: Conda list - shell: pwsh - run: conda list + run: | + # tailor the numpy version to match the GSAS-II binaries + if [ "${{ matrix.env }}" == "py313" ]; then + npver=2.2 + elif [ "${{ matrix.env }}" == "py312" ]; then + npver=2.2 + elif [ "${{ matrix.env }}" == "py311" ]; then + npver=1.26 + fi + conda list + conda info + conda install numpy={$npver} scipy requests pytest # #uses: conda-incubator/setup-miniconda@030178870c779d9e5e1b4e563269f3aa69b04081 # v3.0.3 using hash for security @@ -48,15 +57,3 @@ jobs: # #channels: conda-forge # - name: config python - # run: | - # # tailor the numpy version to match the GSAS-II binaries - # if [ "${{ matrix.env }}" == "py313" ]; then - # npver=2.2 - # elif [ "${{ matrix.env }}" == "py312" ]; then - # npver=2.2 - # elif [ "${{ matrix.env }}" == "py311" ]; then - # npver=1.26 - # fi - # conda list - # conda info - # #conda create build python=${{ matrix.python-version }} numpy={$npver} scipy requests pytest From 742a7a304075b2438eb60f3e3f4f4be7682fc5c4 Mon Sep 17 00:00:00 2001 From: BHT Date: Thu, 6 Mar 2025 16:42:08 -0600 Subject: [PATCH 08/33] try w/my commands --- .github/workflows/win_test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/win_test.yml b/.github/workflows/win_test.yml index 82cdf8b0c..8c6fad3db 100644 --- a/.github/workflows/win_test.yml +++ b/.github/workflows/win_test.yml @@ -33,7 +33,6 @@ jobs: python-version: ${{ matrix.python-version }} - name: Conda info shell: bash -el {0} - run: conda info run: | # tailor the numpy version to match the GSAS-II binaries if [ "${{ matrix.env }}" == "py313" ]; then From 5d9eb62f2467286e587ffdc78a65edfbce72da99 Mon Sep 17 00:00:00 2001 From: BHT Date: Thu, 6 Mar 2025 16:45:08 -0600 Subject: [PATCH 09/33] try fix my commands --- .github/workflows/win_test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/win_test.yml b/.github/workflows/win_test.yml index 8c6fad3db..94447ebb1 100644 --- a/.github/workflows/win_test.yml +++ b/.github/workflows/win_test.yml @@ -42,9 +42,9 @@ jobs: elif [ "${{ matrix.env }}" == "py311" ]; then npver=1.26 fi - conda list - conda info - conda install numpy={$npver} scipy requests pytest + #conda list + #conda info + conda install numpy=${npver} scipy requests pytest # #uses: conda-incubator/setup-miniconda@030178870c779d9e5e1b4e563269f3aa69b04081 # v3.0.3 using hash for security From c5d1338b0039c48507fbe90326130c3fd19a0a56 Mon Sep 17 00:00:00 2001 From: BHT Date: Thu, 6 Mar 2025 16:53:54 -0600 Subject: [PATCH 10/33] try gsas2pkg --- .github/workflows/win_test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/win_test.yml b/.github/workflows/win_test.yml index 94447ebb1..80af5324c 100644 --- a/.github/workflows/win_test.yml +++ b/.github/workflows/win_test.yml @@ -44,7 +44,8 @@ jobs: fi #conda list #conda info - conda install numpy=${npver} scipy requests pytest + #conda install --quiet numpy=${npver} scipy requests pytest + conda install --quiet numpy=${npver} requests pytest briantoby::gsas2pkg # #uses: conda-incubator/setup-miniconda@030178870c779d9e5e1b4e563269f3aa69b04081 # v3.0.3 using hash for security From c725efc8f2b9715a5aa1d6c3d0b20620e1f6e5a1 Mon Sep 17 00:00:00 2001 From: BHT Date: Thu, 6 Mar 2025 16:57:35 -0600 Subject: [PATCH 11/33] try gsas2pkg --- .github/workflows/win_test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/win_test.yml b/.github/workflows/win_test.yml index 80af5324c..4312c9b3e 100644 --- a/.github/workflows/win_test.yml +++ b/.github/workflows/win_test.yml @@ -31,7 +31,7 @@ jobs: with: auto-update-conda: true python-version: ${{ matrix.python-version }} - - name: Conda info + - name: Conda install shell: bash -el {0} run: | # tailor the numpy version to match the GSAS-II binaries @@ -45,7 +45,7 @@ jobs: #conda list #conda info #conda install --quiet numpy=${npver} scipy requests pytest - conda install --quiet numpy=${npver} requests pytest briantoby::gsas2pkg + conda install --quiet numpy=${npver} requests pytest briantoby::gsas2pkg -c conda-forge # #uses: conda-incubator/setup-miniconda@030178870c779d9e5e1b4e563269f3aa69b04081 # v3.0.3 using hash for security From b2ed9b8e7bd01595b02dd891f6b90b73efd9d5f7 Mon Sep 17 00:00:00 2001 From: BHT Date: Thu, 6 Mar 2025 17:11:52 -0600 Subject: [PATCH 12/33] try gitstrap --- .github/workflows/win_test.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/win_test.yml b/.github/workflows/win_test.yml index 4312c9b3e..9edd8042b 100644 --- a/.github/workflows/win_test.yml +++ b/.github/workflows/win_test.yml @@ -44,8 +44,13 @@ jobs: fi #conda list #conda info - #conda install --quiet numpy=${npver} scipy requests pytest - conda install --quiet numpy=${npver} requests pytest briantoby::gsas2pkg -c conda-forge + conda install --quiet numpy=${npver} scipy requests pytest + #conda install --quiet numpy=${npver} requests pytest briantoby::gsas2pkg -c conda-forge + mkdir G2 + cd G2 + curl -L -O https://github.com/AdvancedPhotonSource/GSAS-II-buildtools/raw/main/install/gitstrap.py + python gitstrap.py --nocheck --noshortcut -branch=main + python test/test_elm.py # #uses: conda-incubator/setup-miniconda@030178870c779d9e5e1b4e563269f3aa69b04081 # v3.0.3 using hash for security From 48af72a80cd5f03f6bc0fcb95da2930cc877db7f Mon Sep 17 00:00:00 2001 From: BHT Date: Thu, 6 Mar 2025 17:16:55 -0600 Subject: [PATCH 13/33] try gitstrap 1 --- .github/workflows/win_test.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/win_test.yml b/.github/workflows/win_test.yml index 9edd8042b..fefe2a1a2 100644 --- a/.github/workflows/win_test.yml +++ b/.github/workflows/win_test.yml @@ -44,12 +44,16 @@ jobs: fi #conda list #conda info - conda install --quiet numpy=${npver} scipy requests pytest + conda install --quiet numpy=${npver} scipy requests pytest git gitpython -c conda-forge #conda install --quiet numpy=${npver} requests pytest briantoby::gsas2pkg -c conda-forge + - name: GSAS-II install + shell: bash -el {0} mkdir G2 cd G2 curl -L -O https://github.com/AdvancedPhotonSource/GSAS-II-buildtools/raw/main/install/gitstrap.py - python gitstrap.py --nocheck --noshortcut -branch=main + python gitstrap.py --nocheck --noshortcut --branch=main + - name: GSAS-II test + shell: bash -el {0} python test/test_elm.py From 8b5a44cbbc4466fa8345f382182e38af2be05942 Mon Sep 17 00:00:00 2001 From: BHT Date: Thu, 6 Mar 2025 17:17:47 -0600 Subject: [PATCH 14/33] try gitstrap 2 --- .github/workflows/win_test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/win_test.yml b/.github/workflows/win_test.yml index fefe2a1a2..dcbab1706 100644 --- a/.github/workflows/win_test.yml +++ b/.github/workflows/win_test.yml @@ -48,12 +48,14 @@ jobs: #conda install --quiet numpy=${npver} requests pytest briantoby::gsas2pkg -c conda-forge - name: GSAS-II install shell: bash -el {0} + run: | mkdir G2 cd G2 curl -L -O https://github.com/AdvancedPhotonSource/GSAS-II-buildtools/raw/main/install/gitstrap.py python gitstrap.py --nocheck --noshortcut --branch=main - name: GSAS-II test shell: bash -el {0} + run: | python test/test_elm.py From f4dca8475e2019926bdf544a48938e673054ba04 Mon Sep 17 00:00:00 2001 From: BHT Date: Thu, 6 Mar 2025 17:29:09 -0600 Subject: [PATCH 15/33] try gitstrap 3 --- .github/workflows/win_test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/win_test.yml b/.github/workflows/win_test.yml index dcbab1706..46660bfad 100644 --- a/.github/workflows/win_test.yml +++ b/.github/workflows/win_test.yml @@ -56,6 +56,7 @@ jobs: - name: GSAS-II test shell: bash -el {0} run: | + cd G2 python test/test_elm.py From 5239ed2fadb3588bc56c690da6aa11323fcdff02 Mon Sep 17 00:00:00 2001 From: BHT Date: Thu, 6 Mar 2025 17:38:56 -0600 Subject: [PATCH 16/33] try self-tests --- .github/workflows/win_test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/win_test.yml b/.github/workflows/win_test.yml index 46660bfad..fbad0e11d 100644 --- a/.github/workflows/win_test.yml +++ b/.github/workflows/win_test.yml @@ -57,7 +57,8 @@ jobs: shell: bash -el {0} run: | cd G2 - python test/test_elm.py + python tests/test_elm.py + python -m pytest # #uses: conda-incubator/setup-miniconda@030178870c779d9e5e1b4e563269f3aa69b04081 # v3.0.3 using hash for security From 6ab89caa5a4fa0f73bbf8d18acecd86b244f820c Mon Sep 17 00:00:00 2001 From: BHT Date: Thu, 6 Mar 2025 17:50:12 -0600 Subject: [PATCH 17/33] find self-tests --- .github/workflows/win_test.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/win_test.yml b/.github/workflows/win_test.yml index fbad0e11d..89738d0df 100644 --- a/.github/workflows/win_test.yml +++ b/.github/workflows/win_test.yml @@ -49,14 +49,17 @@ jobs: - name: GSAS-II install shell: bash -el {0} run: | - mkdir G2 - cd G2 + #mkdir G2 + #cd G2 curl -L -O https://github.com/AdvancedPhotonSource/GSAS-II-buildtools/raw/main/install/gitstrap.py python gitstrap.py --nocheck --noshortcut --branch=main - name: GSAS-II test shell: bash -el {0} run: | - cd G2 + dir /s + #cd G2 + dir GSAS-II + dir /s python tests/test_elm.py python -m pytest From 7c9026be13dbd1850f77aabf8e5db3661ef0351f Mon Sep 17 00:00:00 2001 From: BHT Date: Thu, 6 Mar 2025 18:11:22 -0600 Subject: [PATCH 18/33] find self-tests 1 --- .github/workflows/win_test.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/win_test.yml b/.github/workflows/win_test.yml index 89738d0df..3373219dc 100644 --- a/.github/workflows/win_test.yml +++ b/.github/workflows/win_test.yml @@ -56,10 +56,8 @@ jobs: - name: GSAS-II test shell: bash -el {0} run: | - dir /s - #cd G2 - dir GSAS-II - dir /s + ls -R + cd GSAS-II python tests/test_elm.py python -m pytest From 98eec6b5b761aae73f27818d7b4f861f9093fc4c Mon Sep 17 00:00:00 2001 From: BHT Date: Fri, 7 Mar 2025 17:10:55 -0600 Subject: [PATCH 19/33] work on self-tests --- .github/workflows/win_test.yml | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/.github/workflows/win_test.yml b/.github/workflows/win_test.yml index 3373219dc..6007d28ea 100644 --- a/.github/workflows/win_test.yml +++ b/.github/workflows/win_test.yml @@ -53,14 +53,41 @@ jobs: #cd G2 curl -L -O https://github.com/AdvancedPhotonSource/GSAS-II-buildtools/raw/main/install/gitstrap.py python gitstrap.py --nocheck --noshortcut --branch=main - - name: GSAS-II test + - name: find files + shell: bash -el {0} + run: | + ls -l GSAS-II/GSASII-bin/win_64_p3.13_n2.2 + ls -l GSAS-II/tests2 + - name: GSAS-II single test + if: always() shell: bash -el {0} run: | - ls -R cd GSAS-II python tests/test_elm.py - python -m pytest + - name: GSAS-II all tests + if: always() + shell: bash -el {0} + run: | + cd GSAS-II + ls + python -m pytest + - name: try pyspg + if: always() + shell: bash -el {0} + run: | + cd GSAS-II/GSASII-bin/win_64_p3.13_n2.2 + python -c import pyspg + + - name: try ldd + if: always() + shell: bash -el {0} + run: | + conda create -n ntldd m2w64-ntldd-git + conda activate ntldd + cd GSAS-II/GSASII-bin/win_64_p3.13_n2.2 + ls + ntldd *.py # #uses: conda-incubator/setup-miniconda@030178870c779d9e5e1b4e563269f3aa69b04081 # v3.0.3 using hash for security # with: From 235f5c5cbd16984442ae2f1e06fbd8c0a41bc709 Mon Sep 17 00:00:00 2001 From: BHT Date: Fri, 7 Mar 2025 17:40:27 -0600 Subject: [PATCH 20/33] work on self-tests 1 --- .github/workflows/win_test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/win_test.yml b/.github/workflows/win_test.yml index 6007d28ea..f4a63ecd5 100644 --- a/.github/workflows/win_test.yml +++ b/.github/workflows/win_test.yml @@ -57,7 +57,7 @@ jobs: shell: bash -el {0} run: | ls -l GSAS-II/GSASII-bin/win_64_p3.13_n2.2 - ls -l GSAS-II/tests2 + ls -l GSAS-II/tests - name: GSAS-II single test if: always() shell: bash -el {0} @@ -77,7 +77,7 @@ jobs: shell: bash -el {0} run: | cd GSAS-II/GSASII-bin/win_64_p3.13_n2.2 - python -c import pyspg + python -c "import pyspg" - name: try ldd if: always() @@ -87,7 +87,7 @@ jobs: conda activate ntldd cd GSAS-II/GSASII-bin/win_64_p3.13_n2.2 ls - ntldd *.py + ntldd *.pyd # #uses: conda-incubator/setup-miniconda@030178870c779d9e5e1b4e563269f3aa69b04081 # v3.0.3 using hash for security # with: From 444ec5a7efdcf1958f28ec8145f722e510723bbd Mon Sep 17 00:00:00 2001 From: BHT Date: Fri, 7 Mar 2025 17:48:14 -0600 Subject: [PATCH 21/33] work on self-tests 2 --- .github/workflows/win_test.yml | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/workflows/win_test.yml b/.github/workflows/win_test.yml index f4a63ecd5..03f91b437 100644 --- a/.github/workflows/win_test.yml +++ b/.github/workflows/win_test.yml @@ -64,26 +64,29 @@ jobs: run: | cd GSAS-II python tests/test_elm.py + python tests/test_spg.py + + # - name: GSAS-II all tests + # if: always() + # shell: bash -el {0} + # run: | + # cd GSAS-II + # ls + # python -m pytest - - name: GSAS-II all tests - if: always() - shell: bash -el {0} - run: | - cd GSAS-II - ls - python -m pytest - name: try pyspg if: always() shell: bash -el {0} run: | cd GSAS-II/GSASII-bin/win_64_p3.13_n2.2 - python -c "import pyspg" + python + python -v -c "import pyspg" - name: try ldd if: always() shell: bash -el {0} run: | - conda create -n ntldd m2w64-ntldd-git + conda create -n ntldd python=3.13 m2w64-ntldd-git conda activate ntldd cd GSAS-II/GSASII-bin/win_64_p3.13_n2.2 ls From 9dc1879b256f757fc2009a40c38111600e04a67d Mon Sep 17 00:00:00 2001 From: BHT Date: Fri, 7 Mar 2025 18:14:20 -0600 Subject: [PATCH 22/33] work on self-tests 3 --- .github/workflows/win_test.yml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/win_test.yml b/.github/workflows/win_test.yml index 03f91b437..e53a76aac 100644 --- a/.github/workflows/win_test.yml +++ b/.github/workflows/win_test.yml @@ -35,17 +35,17 @@ jobs: shell: bash -el {0} run: | # tailor the numpy version to match the GSAS-II binaries - if [ "${{ matrix.env }}" == "py313" ]; then + if [ "${{ matrix.python-version }}" == "3.13" ]; then npver=2.2 - elif [ "${{ matrix.env }}" == "py312" ]; then + elif [ "${{ matrix.python-version }}" == "3.12" ]; then npver=2.2 - elif [ "${{ matrix.env }}" == "py311" ]; then + elif [ "${{ matrix.python-version }}" == "3.11" ]; then npver=1.26 fi - #conda list - #conda info - conda install --quiet numpy=${npver} scipy requests pytest git gitpython -c conda-forge + conda install python=${{ matrix.python-version }} numpy=${npver} scipy requests pytest git gitpython -c conda-forge --override-channels --quiet #conda install --quiet numpy=${npver} requests pytest briantoby::gsas2pkg -c conda-forge + conda info + conda list - name: GSAS-II install shell: bash -el {0} run: | @@ -53,18 +53,20 @@ jobs: #cd G2 curl -L -O https://github.com/AdvancedPhotonSource/GSAS-II-buildtools/raw/main/install/gitstrap.py python gitstrap.py --nocheck --noshortcut --branch=main + - name: find files shell: bash -el {0} run: | ls -l GSAS-II/GSASII-bin/win_64_p3.13_n2.2 ls -l GSAS-II/tests + - name: GSAS-II single test if: always() shell: bash -el {0} run: | cd GSAS-II python tests/test_elm.py - python tests/test_spg.py + # python tests/test_spg.py # - name: GSAS-II all tests # if: always() @@ -79,7 +81,8 @@ jobs: shell: bash -el {0} run: | cd GSAS-II/GSASII-bin/win_64_p3.13_n2.2 - python + python -VV + python -v -c "import sys; print(sys.path)" python -v -c "import pyspg" - name: try ldd @@ -91,6 +94,7 @@ jobs: cd GSAS-II/GSASII-bin/win_64_p3.13_n2.2 ls ntldd *.pyd + python -c "import pyspg" # #uses: conda-incubator/setup-miniconda@030178870c779d9e5e1b4e563269f3aa69b04081 # v3.0.3 using hash for security # with: From f133fedb7c2dceece5fe9a0f54616c8a8cbb6076 Mon Sep 17 00:00:00 2001 From: BHT Date: Fri, 7 Mar 2025 18:36:48 -0600 Subject: [PATCH 23/33] work on self-tests 3; force gil --- .github/workflows/win_test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/win_test.yml b/.github/workflows/win_test.yml index e53a76aac..41bcca85c 100644 --- a/.github/workflows/win_test.yml +++ b/.github/workflows/win_test.yml @@ -42,7 +42,7 @@ jobs: elif [ "${{ matrix.python-version }}" == "3.11" ]; then npver=1.26 fi - conda install python=${{ matrix.python-version }} numpy=${npver} scipy requests pytest git gitpython -c conda-forge --override-channels --quiet + conda install python-gil python=${{ matrix.python-version }} numpy=${npver} scipy requests pytest git gitpython -c conda-forge --override-channels --quiet #conda install --quiet numpy=${npver} requests pytest briantoby::gsas2pkg -c conda-forge conda info conda list @@ -89,7 +89,7 @@ jobs: if: always() shell: bash -el {0} run: | - conda create -n ntldd python=3.13 m2w64-ntldd-git + conda create -n ntldd python=3.13 numpy=2.2 m2w64-ntldd-git conda activate ntldd cd GSAS-II/GSASII-bin/win_64_p3.13_n2.2 ls From 307ef079cd28f2c3c01379c1f79414b16d2e9f8d Mon Sep 17 00:00:00 2001 From: BHT Date: Fri, 7 Mar 2025 20:36:12 -0600 Subject: [PATCH 24/33] test w/gitstrap --- .github/workflows/win-gitstrap-selftest.yml | 58 +++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 .github/workflows/win-gitstrap-selftest.yml diff --git a/.github/workflows/win-gitstrap-selftest.yml b/.github/workflows/win-gitstrap-selftest.yml new file mode 100644 index 000000000..b7908a0f1 --- /dev/null +++ b/.github/workflows/win-gitstrap-selftest.yml @@ -0,0 +1,58 @@ +name: GSAS-II self-tests on Windows via gitstrap + +on: + # Runs on pushes targeting the default branch + push: + branches-ignore: + - master + # branches: ['main'] + pull_request: + branches: ['main'] + + workflow_dispatch: # Allows running this workflow manually + +jobs: + test-GSAS-II: + strategy: + fail-fast: false + matrix: + python-version: ["3.11", "3.12", "3.13"] +# python-version: ["3.13"] + runs-on: 'windows-latest' + steps: + - uses: conda-incubator/setup-miniconda@v3 + with: + auto-update-conda: true + python-version: ${{ matrix.python-version }} + - name: Conda install + shell: bash -el {0} + run: | + # tailor the numpy version to match the GSAS-II binaries + if [ "${{ matrix.python-version }}" == "3.13" ]; then + npver=2.2 + elif [ "${{ matrix.python-version }}" == "3.12" ]; then + npver=2.2 + elif [ "${{ matrix.python-version }}" == "3.11" ]; then + npver=1.26 + fi + conda install python-gil python=${{ matrix.python-version }} numpy=${npver} scipy requests pytest git gitpython -c conda-forge --override-channels --quiet + #conda info + #conda list + - name: GSAS-II install + shell: bash -el {0} + run: | + curl -L -O https://github.com/AdvancedPhotonSource/GSAS-II-buildtools/raw/main/install/gitstrap.py + python gitstrap.py --nocheck --noshortcut --branch=main + + # - name: GSAS-II single test + # shell: bash -el {0} + # run: | + # cd GSAS-II + # python tests/test_elm.py + # python tests/test_spg.py + + - name: GSAS-II all tests + shell: bash -el {0} + run: | + cd GSAS-II + python -m pytest From 89a94b62a3bddaa13e629e1c0cb4798c7d703f55 Mon Sep 17 00:00:00 2001 From: BHT Date: Fri, 7 Mar 2025 21:06:11 -0600 Subject: [PATCH 25/33] more work on self-tests --- .github/workflows/win-gitstrap-selftest.yml | 2 +- GSASII/GSASIIscriptable.py | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/win-gitstrap-selftest.yml b/.github/workflows/win-gitstrap-selftest.yml index b7908a0f1..72892cc0b 100644 --- a/.github/workflows/win-gitstrap-selftest.yml +++ b/.github/workflows/win-gitstrap-selftest.yml @@ -35,7 +35,7 @@ jobs: elif [ "${{ matrix.python-version }}" == "3.11" ]; then npver=1.26 fi - conda install python-gil python=${{ matrix.python-version }} numpy=${npver} scipy requests pytest git gitpython -c conda-forge --override-channels --quiet + conda install python-gil python=${{ matrix.python-version }} numpy=${npver} scipy requests pytest git gitpython pycifrw -c conda-forge --override-channels --quiet #conda info #conda list - name: GSAS-II install diff --git a/GSASII/GSASIIscriptable.py b/GSASII/GSASIIscriptable.py index e5b063b05..e3dbe77aa 100644 --- a/GSASII/GSASIIscriptable.py +++ b/GSASII/GSASIIscriptable.py @@ -77,6 +77,12 @@ def SetPrintLevel(level): if mode in level.lower(): printLevel = mode return +def SetDebugMode(mode): + '''Set the debug configuration mode on (mode=True) or off (mode=False). + This will provide some additional output that may help with + tracking down problems in the code. + ''' + GSASIIpath.SetConfigValue({'debug':bool(mode)}) def installScriptingShortcut(): '''Creates a file named G2script in the current Python site-packages directory. @@ -429,7 +435,7 @@ def import_generic(filename, readerlist, fmthint=None, bank=None, elif flag: primaryReaders.append(reader) if not secondaryReaders and not primaryReaders: - raise G2ImportException("Could not read file: ", filename) + raise G2ImportException(f"Could not read file: {filename}") with open(filename, 'r'): rd_list = [] @@ -486,7 +492,7 @@ def import_generic(filename, readerlist, fmthint=None, bank=None, G2fil.G2Print("{} block # {} read by Reader {}" .format(filename,bank,rd.formatName)) return rd_list - raise G2ImportException("No reader could read file: " + filename) + raise G2ImportException(f"No reader could read file: {filename}") def load_iprms(instfile, reader, bank=None): @@ -533,8 +539,7 @@ def load_iprms(instfile, reader, bank=None): elif ibanks == 1: reader.instbank = 1 else: - raise G2ImportException("Instrument parameter file has {} banks, select one with instbank param." - .format(ibanks)) + raise G2ImportException(f"Instrument parameter file has {ibanks} banks, select one with instbank param.") reader.powderentry[2] = 1 reader.instfile = instfile reader.instmsg = '{} bank {}'.format(instfile,reader.instbank) From 3d7fbc857ff41334e495e559be1e8abe12c7deef Mon Sep 17 00:00:00 2001 From: BHT Date: Fri, 7 Mar 2025 21:18:08 -0600 Subject: [PATCH 26/33] more work on 3.11 self-tests --- .github/workflows/win-gitstrap-selftest.yml | 10 ++++---- .github/workflows/win_test.yml | 27 ++++----------------- 2 files changed, 10 insertions(+), 27 deletions(-) diff --git a/.github/workflows/win-gitstrap-selftest.yml b/.github/workflows/win-gitstrap-selftest.yml index 72892cc0b..e4fc57e63 100644 --- a/.github/workflows/win-gitstrap-selftest.yml +++ b/.github/workflows/win-gitstrap-selftest.yml @@ -2,12 +2,12 @@ name: GSAS-II self-tests on Windows via gitstrap on: # Runs on pushes targeting the default branch - push: - branches-ignore: - - master +# push: +# branches-ignore: +# - master # branches: ['main'] - pull_request: - branches: ['main'] +# pull_request: +# branches: ['main'] workflow_dispatch: # Allows running this workflow manually diff --git a/.github/workflows/win_test.yml b/.github/workflows/win_test.yml index 41bcca85c..b445e0431 100644 --- a/.github/workflows/win_test.yml +++ b/.github/workflows/win_test.yml @@ -5,26 +5,19 @@ on: push: branches-ignore: - master - - main - # branches: ['develop'] + # branches: ['main'] # pull_request: # branches: ['main'] workflow_dispatch: # Allows running this workflow manually - -# Default to bash -#defaults: -# run: -# shell: bash - jobs: - test-G2: + test-GSAS-II: strategy: fail-fast: false matrix: # python-version: ["3.11", "3.12", "3.13"] - python-version: ["3.13"] + python-version: ["3.11"] runs-on: 'windows-latest' steps: - uses: conda-incubator/setup-miniconda@v3 @@ -42,7 +35,7 @@ jobs: elif [ "${{ matrix.python-version }}" == "3.11" ]; then npver=1.26 fi - conda install python-gil python=${{ matrix.python-version }} numpy=${npver} scipy requests pytest git gitpython -c conda-forge --override-channels --quiet + conda install python-gil python=${{ matrix.python-version }} numpy=${npver} scipy requests pytest git gitpython pycifrw -c conda-forge --override-channels --quiet #conda install --quiet numpy=${npver} requests pytest briantoby::gsas2pkg -c conda-forge conda info conda list @@ -66,7 +59,7 @@ jobs: run: | cd GSAS-II python tests/test_elm.py - # python tests/test_spg.py + python tests/test_spg.py # - name: GSAS-II all tests # if: always() @@ -95,13 +88,3 @@ jobs: ls ntldd *.pyd python -c "import pyspg" - - # #uses: conda-incubator/setup-miniconda@030178870c779d9e5e1b4e563269f3aa69b04081 # v3.0.3 using hash for security - # with: - # #activate-environment: build - # miniforge-version: latest - # auto-activate-base: true - # #python-version: ${{ matrix.python-version }} - # #channels: conda-forge - - # - name: config python From f177b22e8d4a415fe8958698fe6f7c75a27c021d Mon Sep 17 00:00:00 2001 From: BHT Date: Fri, 7 Mar 2025 21:22:29 -0600 Subject: [PATCH 27/33] 3.11 self-tests --- .github/workflows/win_test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/win_test.yml b/.github/workflows/win_test.yml index b445e0431..64bbf7893 100644 --- a/.github/workflows/win_test.yml +++ b/.github/workflows/win_test.yml @@ -29,13 +29,13 @@ jobs: run: | # tailor the numpy version to match the GSAS-II binaries if [ "${{ matrix.python-version }}" == "3.13" ]; then - npver=2.2 + npver="2.2 python-gil" elif [ "${{ matrix.python-version }}" == "3.12" ]; then npver=2.2 elif [ "${{ matrix.python-version }}" == "3.11" ]; then npver=1.26 fi - conda install python-gil python=${{ matrix.python-version }} numpy=${npver} scipy requests pytest git gitpython pycifrw -c conda-forge --override-channels --quiet + conda install python=${{ matrix.python-version }} numpy=${npver} scipy requests pytest git gitpython pycifrw -c conda-forge --override-channels --quiet #conda install --quiet numpy=${npver} requests pytest briantoby::gsas2pkg -c conda-forge conda info conda list From 30cdff13c6774b750a93db97c7a08aa5c260b5ec Mon Sep 17 00:00:00 2001 From: BHT Date: Fri, 7 Mar 2025 21:35:50 -0600 Subject: [PATCH 28/33] 3.11 self-tests 1 --- .github/workflows/win_test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/win_test.yml b/.github/workflows/win_test.yml index 64bbf7893..91cd8200e 100644 --- a/.github/workflows/win_test.yml +++ b/.github/workflows/win_test.yml @@ -50,7 +50,7 @@ jobs: - name: find files shell: bash -el {0} run: | - ls -l GSAS-II/GSASII-bin/win_64_p3.13_n2.2 + ls -l GSAS-II/GSASII-bin/win_64_p3.11_n1.26 ls -l GSAS-II/tests - name: GSAS-II single test @@ -73,9 +73,9 @@ jobs: if: always() shell: bash -el {0} run: | - cd GSAS-II/GSASII-bin/win_64_p3.13_n2.2 + cd GSAS-II/GSASII-bin/win_64_p3.11_n1.26 python -VV - python -v -c "import sys; print(sys.path)" + #python -v -c "import sys; print(sys.path)" python -v -c "import pyspg" - name: try ldd @@ -84,7 +84,7 @@ jobs: run: | conda create -n ntldd python=3.13 numpy=2.2 m2w64-ntldd-git conda activate ntldd - cd GSAS-II/GSASII-bin/win_64_p3.13_n2.2 + cd GSAS-II/GSASII-bin/win_64_p3.11_n1.26 ls ntldd *.pyd python -c "import pyspg" From 8f353ec7424b275af572961b08e9ca077854d343 Mon Sep 17 00:00:00 2001 From: BHT Date: Fri, 7 Mar 2025 21:50:54 -0600 Subject: [PATCH 29/33] 3.12 self-tests --- .github/workflows/win-gitstrap-selftest.yml | 7 ++++--- .github/workflows/win_test.yml | 12 ++++++++---- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/win-gitstrap-selftest.yml b/.github/workflows/win-gitstrap-selftest.yml index e4fc57e63..76dffbcd0 100644 --- a/.github/workflows/win-gitstrap-selftest.yml +++ b/.github/workflows/win-gitstrap-selftest.yml @@ -16,7 +16,8 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.11", "3.12", "3.13"] + python-version: ["3.12", "3.13"] +# python-version: ["3.11", "3.12", "3.13"] # python-version: ["3.13"] runs-on: 'windows-latest' steps: @@ -29,13 +30,13 @@ jobs: run: | # tailor the numpy version to match the GSAS-II binaries if [ "${{ matrix.python-version }}" == "3.13" ]; then - npver=2.2 + npver="2.2 python-gil" elif [ "${{ matrix.python-version }}" == "3.12" ]; then npver=2.2 elif [ "${{ matrix.python-version }}" == "3.11" ]; then npver=1.26 fi - conda install python-gil python=${{ matrix.python-version }} numpy=${npver} scipy requests pytest git gitpython pycifrw -c conda-forge --override-channels --quiet + conda install python=${{ matrix.python-version }} numpy=${npver} scipy requests pytest git gitpython pycifrw -c conda-forge --override-channels --quiet #conda info #conda list - name: GSAS-II install diff --git a/.github/workflows/win_test.yml b/.github/workflows/win_test.yml index 91cd8200e..5ce2591d6 100644 --- a/.github/workflows/win_test.yml +++ b/.github/workflows/win_test.yml @@ -17,7 +17,8 @@ jobs: fail-fast: false matrix: # python-version: ["3.11", "3.12", "3.13"] - python-version: ["3.11"] +# python-version: ["3.11"] + python-version: ["3.12"] runs-on: 'windows-latest' steps: - uses: conda-incubator/setup-miniconda@v3 @@ -50,7 +51,8 @@ jobs: - name: find files shell: bash -el {0} run: | - ls -l GSAS-II/GSASII-bin/win_64_p3.11_n1.26 + #ls -l GSAS-II/GSASII-bin/win_64_p3.11_n1.26 + ls -l GSAS-II/GSASII-bin/win_64_p3.12_n2.2 ls -l GSAS-II/tests - name: GSAS-II single test @@ -73,7 +75,8 @@ jobs: if: always() shell: bash -el {0} run: | - cd GSAS-II/GSASII-bin/win_64_p3.11_n1.26 + #cd GSAS-II/GSASII-bin/win_64_p3.11_n1.26 + cd GSAS-II/GSASII-bin/win_64_p3.12_n2.2 python -VV #python -v -c "import sys; print(sys.path)" python -v -c "import pyspg" @@ -84,7 +87,8 @@ jobs: run: | conda create -n ntldd python=3.13 numpy=2.2 m2w64-ntldd-git conda activate ntldd - cd GSAS-II/GSASII-bin/win_64_p3.11_n1.26 + #cd GSAS-II/GSASII-bin/win_64_p3.11_n1.26 + cd GSAS-II/GSASII-bin/win_64_p3.12_n2.2 ls ntldd *.pyd python -c "import pyspg" From 3d395fede21bccfd7b3602777ec82859147c977e Mon Sep 17 00:00:00 2001 From: BHT Date: Fri, 7 Mar 2025 22:02:33 -0600 Subject: [PATCH 30/33] more on 3.12 self-tests --- .github/workflows/win-gitstrap-selftest.yml | 2 +- .github/workflows/win_test.yml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/win-gitstrap-selftest.yml b/.github/workflows/win-gitstrap-selftest.yml index 76dffbcd0..f7dfd7c0f 100644 --- a/.github/workflows/win-gitstrap-selftest.yml +++ b/.github/workflows/win-gitstrap-selftest.yml @@ -1,6 +1,7 @@ name: GSAS-II self-tests on Windows via gitstrap on: + workflow_dispatch: # Allows running this workflow manually # Runs on pushes targeting the default branch # push: # branches-ignore: @@ -9,7 +10,6 @@ on: # pull_request: # branches: ['main'] - workflow_dispatch: # Allows running this workflow manually jobs: test-GSAS-II: diff --git a/.github/workflows/win_test.yml b/.github/workflows/win_test.yml index 5ce2591d6..ab3d2b398 100644 --- a/.github/workflows/win_test.yml +++ b/.github/workflows/win_test.yml @@ -1,6 +1,7 @@ name: run self-tests on Windows on: + workflow_dispatch: # Allows running this workflow manually # Runs on pushes targeting the default branch push: branches-ignore: @@ -9,7 +10,6 @@ on: # pull_request: # branches: ['main'] - workflow_dispatch: # Allows running this workflow manually jobs: test-GSAS-II: @@ -36,6 +36,8 @@ jobs: elif [ "${{ matrix.python-version }}" == "3.11" ]; then npver=1.26 fi + conda list + conda info conda install python=${{ matrix.python-version }} numpy=${npver} scipy requests pytest git gitpython pycifrw -c conda-forge --override-channels --quiet #conda install --quiet numpy=${npver} requests pytest briantoby::gsas2pkg -c conda-forge conda info From d7468faee25058b6dfae094369b4cd55ba198f7b Mon Sep 17 00:00:00 2001 From: BHT Date: Fri, 7 Mar 2025 22:17:08 -0600 Subject: [PATCH 31/33] more on 3.12 self-tests --- .github/workflows/win-gitstrap-selftest.yml | 6 +++--- .github/workflows/win_test.yml | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/win-gitstrap-selftest.yml b/.github/workflows/win-gitstrap-selftest.yml index f7dfd7c0f..1190b0d53 100644 --- a/.github/workflows/win-gitstrap-selftest.yml +++ b/.github/workflows/win-gitstrap-selftest.yml @@ -3,9 +3,9 @@ name: GSAS-II self-tests on Windows via gitstrap on: workflow_dispatch: # Allows running this workflow manually # Runs on pushes targeting the default branch -# push: -# branches-ignore: -# - master + push: + branches-ignore: + - master # branches: ['main'] # pull_request: # branches: ['main'] diff --git a/.github/workflows/win_test.yml b/.github/workflows/win_test.yml index ab3d2b398..a991ac4b0 100644 --- a/.github/workflows/win_test.yml +++ b/.github/workflows/win_test.yml @@ -3,9 +3,9 @@ name: run self-tests on Windows on: workflow_dispatch: # Allows running this workflow manually # Runs on pushes targeting the default branch - push: - branches-ignore: - - master + #push: + # branches-ignore: + # - master # branches: ['main'] # pull_request: # branches: ['main'] @@ -87,7 +87,7 @@ jobs: if: always() shell: bash -el {0} run: | - conda create -n ntldd python=3.13 numpy=2.2 m2w64-ntldd-git + conda create -n ntldd python=3.12 numpy=2.2 m2w64-ntldd-git conda activate ntldd #cd GSAS-II/GSASII-bin/win_64_p3.11_n1.26 cd GSAS-II/GSASII-bin/win_64_p3.12_n2.2 From 050cf2354353581126ed765c303d3ea2f60fed45 Mon Sep 17 00:00:00 2001 From: BHT Date: Fri, 7 Mar 2025 22:37:27 -0600 Subject: [PATCH 32/33] update binary cache list --- GSASII/inputs/BinariesCache.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/GSASII/inputs/BinariesCache.txt b/GSASII/inputs/BinariesCache.txt index 5e7f86b78..cded0eb8c 100644 --- a/GSASII/inputs/BinariesCache.txt +++ b/GSASII/inputs/BinariesCache.txt @@ -1,6 +1,14 @@ linux_64_p3.11_n1.26 : https://github.com/AdvancedPhotonSource/GSAS-II-buildtools/releases/download/v1.0.1/linux_64_p3.11_n1.26.tgz +linux_64_p3.12_n2.2 : https://github.com/AdvancedPhotonSource/GSAS-II-buildtools/releases/download/v1.0.1/linux_64_p3.12_n2.2.tgz +linux_64_p3.13_n2.2 : https://github.com/AdvancedPhotonSource/GSAS-II-buildtools/releases/download/v1.0.1/linux_64_p3.13_n2.2.tgz linux_arm32_p3.11_n1.24 : https://github.com/AdvancedPhotonSource/GSAS-II-buildtools/releases/download/v1.0.1/linux_arm32_p3.11_n1.24.tgz linux_arm64_p3.11_n1.26 : https://github.com/AdvancedPhotonSource/GSAS-II-buildtools/releases/download/v1.0.1/linux_arm64_p3.11_n1.26.tgz mac_64_p3.11_n1.26 : https://github.com/AdvancedPhotonSource/GSAS-II-buildtools/releases/download/v1.0.1/mac_64_p3.11_n1.26.tgz +mac_64_p3.12_n2.2 : https://github.com/AdvancedPhotonSource/GSAS-II-buildtools/releases/download/v1.0.1/mac_64_p3.12_n2.2.tgz +mac_64_p3.13_n2.2 : https://github.com/AdvancedPhotonSource/GSAS-II-buildtools/releases/download/v1.0.1/mac_64_p3.13_n2.2.tgz mac_arm_p3.11_n1.26 : https://github.com/AdvancedPhotonSource/GSAS-II-buildtools/releases/download/v1.0.1/mac_arm_p3.11_n1.26.tgz +mac_arm_p3.12_n2.2 : https://github.com/AdvancedPhotonSource/GSAS-II-buildtools/releases/download/v1.0.1/mac_arm_p3.12_n2.2.tgz +mac_arm_p3.13_n2.2 : https://github.com/AdvancedPhotonSource/GSAS-II-buildtools/releases/download/v1.0.1/mac_arm_p3.13_n2.2.tgz win_64_p3.11_n1.26 : https://github.com/AdvancedPhotonSource/GSAS-II-buildtools/releases/download/v1.0.1/win_64_p3.11_n1.26.tgz +win_64_p3.12_n2.2 : https://github.com/AdvancedPhotonSource/GSAS-II-buildtools/releases/download/v1.0.1/win_64_p3.12_n2.2.tgz +win_64_p3.13_n2.2 : https://github.com/AdvancedPhotonSource/GSAS-II-buildtools/releases/download/v1.0.1/win_64_p3.13_n2.2.tgz From 82c8182e36728c57cf7850ce132f51c8b040d11b Mon Sep 17 00:00:00 2001 From: BHT Date: Fri, 7 Mar 2025 22:48:35 -0600 Subject: [PATCH 33/33] work on 3.11 debug --- .github/workflows/win-gitstrap-selftest.yml | 7 ----- .github/workflows/win_test.yml | 29 +++++++++++---------- 2 files changed, 15 insertions(+), 21 deletions(-) diff --git a/.github/workflows/win-gitstrap-selftest.yml b/.github/workflows/win-gitstrap-selftest.yml index 1190b0d53..55119f826 100644 --- a/.github/workflows/win-gitstrap-selftest.yml +++ b/.github/workflows/win-gitstrap-selftest.yml @@ -45,13 +45,6 @@ jobs: curl -L -O https://github.com/AdvancedPhotonSource/GSAS-II-buildtools/raw/main/install/gitstrap.py python gitstrap.py --nocheck --noshortcut --branch=main - # - name: GSAS-II single test - # shell: bash -el {0} - # run: | - # cd GSAS-II - # python tests/test_elm.py - # python tests/test_spg.py - - name: GSAS-II all tests shell: bash -el {0} run: | diff --git a/.github/workflows/win_test.yml b/.github/workflows/win_test.yml index a991ac4b0..f15cc3d1b 100644 --- a/.github/workflows/win_test.yml +++ b/.github/workflows/win_test.yml @@ -1,11 +1,11 @@ -name: run self-tests on Windows +name: debug self-tests on Windows w/3.11 on: workflow_dispatch: # Allows running this workflow manually # Runs on pushes targeting the default branch - #push: - # branches-ignore: - # - master + push: + branches-ignore: + - master # branches: ['main'] # pull_request: # branches: ['main'] @@ -17,8 +17,8 @@ jobs: fail-fast: false matrix: # python-version: ["3.11", "3.12", "3.13"] -# python-version: ["3.11"] - python-version: ["3.12"] + python-version: ["3.11"] +# python-version: ["3.12"] runs-on: 'windows-latest' steps: - uses: conda-incubator/setup-miniconda@v3 @@ -36,8 +36,8 @@ jobs: elif [ "${{ matrix.python-version }}" == "3.11" ]; then npver=1.26 fi - conda list - conda info + #conda list + #conda info conda install python=${{ matrix.python-version }} numpy=${npver} scipy requests pytest git gitpython pycifrw -c conda-forge --override-channels --quiet #conda install --quiet numpy=${npver} requests pytest briantoby::gsas2pkg -c conda-forge conda info @@ -53,8 +53,8 @@ jobs: - name: find files shell: bash -el {0} run: | - #ls -l GSAS-II/GSASII-bin/win_64_p3.11_n1.26 - ls -l GSAS-II/GSASII-bin/win_64_p3.12_n2.2 + ls -l GSAS-II/GSASII-bin/win_64_p3.11_n1.26 + #ls -l GSAS-II/GSASII-bin/win_64_p3.12_n2.2 ls -l GSAS-II/tests - name: GSAS-II single test @@ -77,17 +77,18 @@ jobs: if: always() shell: bash -el {0} run: | - #cd GSAS-II/GSASII-bin/win_64_p3.11_n1.26 - cd GSAS-II/GSASII-bin/win_64_p3.12_n2.2 + cd GSAS-II/GSASII-bin/win_64_p3.11_n1.26 + #cd GSAS-II/GSASII-bin/win_64_p3.12_n2.2 python -VV #python -v -c "import sys; print(sys.path)" - python -v -c "import pyspg" + python -c "import pyspg" - name: try ldd if: always() shell: bash -el {0} run: | - conda create -n ntldd python=3.12 numpy=2.2 m2w64-ntldd-git + #conda create -n ntldd python=3.12 numpy=2.2 m2w64-ntldd-git + conda create -n ntldd python=3.11 numpy=1.26 m2w64-ntldd-git conda activate ntldd #cd GSAS-II/GSASII-bin/win_64_p3.11_n1.26 cd GSAS-II/GSASII-bin/win_64_p3.12_n2.2