From 85640d9e9fca0a8f0aba4ab0eb1e9b5cdc1bd645 Mon Sep 17 00:00:00 2001 From: Tieqiong Zhang Date: Mon, 13 Jan 2025 22:06:15 -0500 Subject: [PATCH 1/2] feat: add support for py3.13 --- .../matrix-and-codecov-on-merge-to-main.yml | 6 ++--- .github/workflows/tests-on-pr.yml | 6 ++--- news/3.13.rst | 23 +++++++++++++++++++ pyproject.toml | 3 ++- 4 files changed, 31 insertions(+), 7 deletions(-) create mode 100644 news/3.13.rst 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 3034fdf7..b801b79f 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"] + python-version: ["3.11", "3.12", "3.13"] env: - LATEST_PYTHON_VERSION: "3.12" + LATEST_PYTHON_VERSION: "3.13" steps: - name: Check out diffpy.pdfgui uses: actions/checkout@v4 @@ -46,7 +46,7 @@ jobs: run: | conda install --file requirements/test.txt conda install wxpython diffpy.utils matplotlib-base - pip install diffpy.pdffit2==1.4.4rc6 + pip install diffpy.pdffit2==1.5.0rc1 python -m pip install . --no-deps - name: Start Xvfb for ubuntu-latest only diff --git a/.github/workflows/tests-on-pr.yml b/.github/workflows/tests-on-pr.yml index 09e0c18e..69180175 100644 --- a/.github/workflows/tests-on-pr.yml +++ b/.github/workflows/tests-on-pr.yml @@ -25,7 +25,7 @@ jobs: auto-update-conda: true environment-file: environment.yml auto-activate-base: false - python-version: 3.12 + python-version: 3.13 - name: Conda config run: >- @@ -35,8 +35,8 @@ jobs: - name: Install diffpy.pdfgui and requirements run: | conda install --file requirements/test.txt - conda install wxpython diffpy.utils matplotlib-base gsl - pip install diffpy.pdffit2==1.4.4rc4 + conda install wxpython diffpy.utils matplotlib-base + pip install diffpy.pdffit2==1.5.0rc1 python -m pip install . --no-deps - name: Start Xvfb diff --git a/news/3.13.rst b/news/3.13.rst new file mode 100644 index 00000000..482e7164 --- /dev/null +++ b/news/3.13.rst @@ -0,0 +1,23 @@ +**Added:** + +* Added support for python 3.13 + +**Changed:** + +* + +**Deprecated:** + +* + +**Removed:** + +* + +**Fixed:** + +* + +**Security:** + +* diff --git a/pyproject.toml b/pyproject.toml index 796a10af..852f9dec 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,7 +14,7 @@ maintainers = [ description = "GUI for PDF simulation and structure refinement." keywords = ['PDF structure refinement GUI'] readme = "README.rst" -requires-python = ">=3.11, <3.13" +requires-python = ">=3.11, <3.14" classifiers = [ 'Development Status :: 5 - Production/Stable', 'Environment :: Console', @@ -27,6 +27,7 @@ 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', ] From 499f3e914c8d411655a38eb5c121178a8717ad3e Mon Sep 17 00:00:00 2001 From: Tieqiong Zhang Date: Mon, 13 Jan 2025 22:16:30 -0500 Subject: [PATCH 2/2] tab align --- .github/workflows/matrix-and-codecov-on-merge-to-main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b801b79f..316ae780 100644 --- a/.github/workflows/matrix-and-codecov-on-merge-to-main.yml +++ b/.github/workflows/matrix-and-codecov-on-merge-to-main.yml @@ -23,7 +23,7 @@ jobs: os: [ubuntu-latest, windows-latest, macos-13, macos-14] python-version: ["3.11", "3.12", "3.13"] env: - LATEST_PYTHON_VERSION: "3.13" + LATEST_PYTHON_VERSION: "3.13" steps: - name: Check out diffpy.pdfgui uses: actions/checkout@v4