From cd1cc824e5f6682438d85b1eb54f173a919e5014 Mon Sep 17 00:00:00 2001 From: Sangjoon Bob Lee Date: Wed, 27 Nov 2024 15:42:09 -0500 Subject: [PATCH 1/4] Remove gooey in conda.txt and install gooey via pip in CI --- .github/workflows/matrix-and-codecov-on-merge-to-main.yml | 3 ++- .github/workflows/tests-on-pr.yml | 3 ++- requirements/conda.txt | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/matrix-and-codecov-on-merge-to-main.yml b/.github/workflows/matrix-and-codecov-on-merge-to-main.yml index ed569c5..d44f297 100644 --- a/.github/workflows/matrix-and-codecov-on-merge-to-main.yml +++ b/.github/workflows/matrix-and-codecov-on-merge-to-main.yml @@ -48,7 +48,8 @@ jobs: sudo apt-get update sudo apt-get install -y libgtk-3-dev conda install --file requirements/test.txt - pip install -r requirements/pip.txt + conda install --file requirements/conda.txt + pip install gooey python -m pip install . --no-deps - name: Install diffpy.labpdfproc and requirements for non-Linux diff --git a/.github/workflows/tests-on-pr.yml b/.github/workflows/tests-on-pr.yml index adcdb8c..81c158f 100644 --- a/.github/workflows/tests-on-pr.yml +++ b/.github/workflows/tests-on-pr.yml @@ -40,7 +40,8 @@ jobs: - name: Install diffpy.labpdfproc and requirements run: | conda install --file requirements/test.txt - pip install -r requirements/pip.txt + conda install --file requirements/conda.txt + pip install gooey python -m pip install . --no-deps diff --git a/requirements/conda.txt b/requirements/conda.txt index 091d553..e8b92dd 100644 --- a/requirements/conda.txt +++ b/requirements/conda.txt @@ -2,4 +2,3 @@ numpy diffpy.utils pandas scipy -gooey From e09f1230c73629ac996f4ce832cc470bac371823 Mon Sep 17 00:00:00 2001 From: Sangjoon Bob Lee Date: Wed, 27 Nov 2024 15:56:50 -0500 Subject: [PATCH 2/4] Use macos to install wxpython from pip instead of linux CI --- .github/workflows/tests-on-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests-on-pr.yml b/.github/workflows/tests-on-pr.yml index 81c158f..7c67f51 100644 --- a/.github/workflows/tests-on-pr.yml +++ b/.github/workflows/tests-on-pr.yml @@ -13,7 +13,7 @@ jobs: run: shell: bash -l {0} - runs-on: ubuntu-latest + runs-on: macos-latest steps: - name: Check out diffpy.labpdfproc repository uses: actions/checkout@v4 From f6ac2258b3eaa109d7e69961b36d2f0b4ab95710 Mon Sep 17 00:00:00 2001 From: Sangjoon Bob Lee Date: Wed, 27 Nov 2024 15:57:23 -0500 Subject: [PATCH 3/4] Remove Install libgtk --- .github/workflows/tests-on-pr.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/tests-on-pr.yml b/.github/workflows/tests-on-pr.yml index 7c67f51..67b4121 100644 --- a/.github/workflows/tests-on-pr.yml +++ b/.github/workflows/tests-on-pr.yml @@ -32,11 +32,6 @@ jobs: conda config --set always_yes yes --set changeps1 no - - name: Install libgtk for Linux - run: | - sudo apt-get update - sudo apt-get install -y libgtk-3-dev - - name: Install diffpy.labpdfproc and requirements run: | conda install --file requirements/test.txt From c8ae7380491545dc3f48ff7f94ecf29a3bbd0e9d Mon Sep 17 00:00:00 2001 From: Sangjoon Bob Lee Date: Mon, 2 Dec 2024 17:18:52 -0500 Subject: [PATCH 4/4] Use linux CI, install wxpython via conda, use py312 --- .../matrix-and-codecov-on-merge-to-main.yml | 16 +++------------- .github/workflows/tests-on-pr.yml | 4 ++-- pyproject.toml | 3 +-- requirements/conda.txt | 1 + 4 files changed, 7 insertions(+), 17 deletions(-) diff --git a/.github/workflows/matrix-and-codecov-on-merge-to-main.yml b/.github/workflows/matrix-and-codecov-on-merge-to-main.yml index d44f297..b953aba 100644 --- a/.github/workflows/matrix-and-codecov-on-merge-to-main.yml +++ b/.github/workflows/matrix-and-codecov-on-merge-to-main.yml @@ -21,9 +21,9 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, windows-latest, macos-13, macos-14] - python-version: ["3.11", "3.12", "3.13"] + python-version: ["3.11", "3.12"] env: - LATEST_PYTHON_VERSION: "3.13" + LATEST_PYTHON_VERSION: "3.12" steps: - name: Check out diffpy.labpdfproc uses: actions/checkout@v4 @@ -42,23 +42,13 @@ jobs: conda config --set always_yes yes --set changeps1 no - - name: Install diffpy.labpdfproc and requirements for Linux - if: runner.os == 'Linux' + - name: Install diffpy.labpdfproc and requirements run: | - sudo apt-get update - sudo apt-get install -y libgtk-3-dev conda install --file requirements/test.txt conda install --file requirements/conda.txt pip install gooey python -m pip install . --no-deps - - name: Install diffpy.labpdfproc and requirements for non-Linux - if: runner.os != 'Linux' - run: | - conda install --file requirements/test.txt - pip install -r requirements/pip.txt - python -m pip install . --no-deps - - name: Validate diffpy.labpdfproc run: | pytest --cov diff --git a/.github/workflows/tests-on-pr.yml b/.github/workflows/tests-on-pr.yml index 67b4121..319c9cd 100644 --- a/.github/workflows/tests-on-pr.yml +++ b/.github/workflows/tests-on-pr.yml @@ -13,7 +13,7 @@ jobs: run: shell: bash -l {0} - runs-on: macos-latest + runs-on: ubuntu-latest steps: - name: Check out diffpy.labpdfproc repository uses: actions/checkout@v4 @@ -25,7 +25,7 @@ jobs: auto-update-conda: true environment-file: environment.yml auto-activate-base: false - python-version: 3.13 + python-version: 3.12 - name: Conda config run: >- diff --git a/pyproject.toml b/pyproject.toml index dfc0458..98e2cbe 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,7 +14,7 @@ maintainers = [ description = "Tools for processing x-ray powder diffraction data from laboratory sources." keywords = ['powder xrd', 'absorption correction', 'pdf', 'diffpy'] readme = "README.rst" -requires-python = ">=3.11, <3.14" +requires-python = ">=3.11, <3.13" classifiers = [ 'Development Status :: 5 - Production/Stable', 'Environment :: Console', @@ -27,7 +27,6 @@ classifiers = [ 'Operating System :: Unix', 'Programming Language :: Python :: 3.11', 'Programming Language :: Python :: 3.12', - 'Programming Language :: Python :: 3.13', 'Topic :: Scientific/Engineering :: Physics', 'Topic :: Scientific/Engineering :: Chemistry', ] diff --git a/requirements/conda.txt b/requirements/conda.txt index e8b92dd..5aef5a8 100644 --- a/requirements/conda.txt +++ b/requirements/conda.txt @@ -2,3 +2,4 @@ numpy diffpy.utils pandas scipy +wxpython