From 0b205725b65289ba1e1049a29b9d69ef12b4316d Mon Sep 17 00:00:00 2001 From: Daniel Kohler <11864045+ddkohler@users.noreply.github.com> Date: Tue, 19 Aug 2025 11:59:27 -0500 Subject: [PATCH 1/7] Update python-app.yml --- .github/workflows/python-app.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index 38c230c..d9f16bb 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -14,21 +14,24 @@ permissions: jobs: build: - - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest, windows-latest] + python-version: [3.11, 3.12, 3.13] steps: - uses: actions/checkout@v4 - - name: Set up Python 3.10 + - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v3 with: - python-version: "3.10" + python-version: ${{ matrix.python-version }} - name: Install dependencies run: | python -m pip install --upgrade pip pip install flake8 pytest if [ -f requirements.txt ]; then pip install -r requirements.txt; fi - pip install . + pip install .[iontof] - name: Lint with flake8 run: | # stop the build if there are Python syntax errors or undefined names From 3b9a278052f5080e7567d65f3eb31385179ba4cd Mon Sep 17 00:00:00 2001 From: Daniel Kohler <11864045+ddkohler@users.noreply.github.com> Date: Tue, 19 Aug 2025 12:06:23 -0500 Subject: [PATCH 2/7] Update python-app.yml --- .github/workflows/python-app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index d9f16bb..6795a05 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -30,7 +30,7 @@ jobs: run: | python -m pip install --upgrade pip pip install flake8 pytest - if [ -f requirements.txt ]; then pip install -r requirements.txt; fi + if [[ -f requirements.txt ]]; then pip install -r requirements.txt; fi pip install .[iontof] - name: Lint with flake8 run: | From 35414383c55c42b873e976c88f401b0be83f4973 Mon Sep 17 00:00:00 2001 From: Daniel Kohler <11864045+ddkohler@users.noreply.github.com> Date: Tue, 19 Aug 2025 12:09:34 -0500 Subject: [PATCH 3/7] Update python-app.yml --- .github/workflows/python-app.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index 6795a05..7d4d156 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -14,12 +14,10 @@ permissions: jobs: build: - runs-on: ${{ matrix.os }} + runs-on: ubuntu-latest strategy: matrix: - os: [ubuntu-latest, windows-latest] python-version: [3.11, 3.12, 3.13] - steps: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} From 07aef8b7b98e20e2be04afb3a8e4f0b5cf6314ee Mon Sep 17 00:00:00 2001 From: Daniel Kohler <11864045+ddkohler@users.noreply.github.com> Date: Tue, 19 Aug 2025 12:18:40 -0500 Subject: [PATCH 4/7] Update python-app.yml --- .github/workflows/python-app.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index 7d4d156..1e9574f 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -14,9 +14,10 @@ permissions: jobs: build: - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} strategy: matrix: + os: [ubuntu-latest, windows-latest] python-version: [3.11, 3.12, 3.13] steps: - uses: actions/checkout@v4 @@ -28,7 +29,6 @@ jobs: run: | python -m pip install --upgrade pip pip install flake8 pytest - if [[ -f requirements.txt ]]; then pip install -r requirements.txt; fi pip install .[iontof] - name: Lint with flake8 run: | From 7944a7a691e6c2c52ab6b5fbea334affa2b3a3a6 Mon Sep 17 00:00:00 2001 From: Daniel Kohler <11864045+ddkohler@users.noreply.github.com> Date: Fri, 5 Sep 2025 16:09:51 -0500 Subject: [PATCH 5/7] Update python-app.yml --- .github/workflows/python-app.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index 1e9574f..0f4fcb3 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -29,7 +29,8 @@ jobs: run: | python -m pip install --upgrade pip pip install flake8 pytest - pip install .[iontof] + pip install . + # pip install .[iontof] - name: Lint with flake8 run: | # stop the build if there are Python syntax errors or undefined names From fa6645deb9f26a2053606e5e0ece526d791c4ea3 Mon Sep 17 00:00:00 2001 From: Daniel Kohler <11864045+ddkohler@users.noreply.github.com> Date: Fri, 5 Sep 2025 16:17:37 -0500 Subject: [PATCH 6/7] Update pyproject.toml --- pyproject.toml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index f7a5929..2c0472c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,11 +5,10 @@ build-backend = "flit_core.buildapi" [project] name = "makeitwright" description = "Plotting and parsing tools for the Jin Group." +readme = "README.md" authors = [{name="Chris Roy"}] maintainers = [{name="Dan Kohler"}] -dynamic = ["version"] requires-python = ">=3.7" -readme = "README.md" dependencies = [ "psutil", "wrighttools", @@ -27,6 +26,8 @@ classifiers = [ "Programming Language :: Python :: 3.10", "Topic :: Scientific/Engineering", ] +dynamic = ["version"] +license = "MIT" [project.optional-dependencies] iontof = ["pySPM"] From e3dbe2170c6dcc9b8c97be12d1c7f35a02367afc Mon Sep 17 00:00:00 2001 From: Daniel Kohler <11864045+ddkohler@users.noreply.github.com> Date: Fri, 5 Sep 2025 16:20:04 -0500 Subject: [PATCH 7/7] Update pyproject.toml --- pyproject.toml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 2c0472c..f60e859 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,13 +17,11 @@ dependencies = [ classifiers = [ "Development Status :: 4 - Beta", "Intended Audience :: Science/Research", - "License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)", "Natural Language :: English", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.7", - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", "Topic :: Scientific/Engineering", ] dynamic = ["version"] @@ -35,4 +33,4 @@ iontof = ["pySPM"] [tool.pytest.ini_options] testpaths = [ "tests", -] \ No newline at end of file +]