From 637dc861f7b42a84b028285951725590acc26f98 Mon Sep 17 00:00:00 2001 From: rozyczko Date: Thu, 15 Aug 2024 15:05:48 +0200 Subject: [PATCH 1/3] try testing with 3.11 in Package_Testing --- .github/workflows/python-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml index 06be58a1..5939928c 100644 --- a/.github/workflows/python-ci.yml +++ b/.github/workflows/python-ci.yml @@ -71,7 +71,7 @@ jobs: - uses: actions/setup-python@v5 with: - python-version: 3.9 + python-version: 3.11 - name: Install dependencies and build run: | From ebbfae4a605aca6f9727e7f6cd4b57c29bfb0781 Mon Sep 17 00:00:00 2001 From: rozyczko Date: Thu, 15 Aug 2024 15:10:41 +0200 Subject: [PATCH 2/3] modify to windows --- .github/workflows/python-ci.yml | 2 +- Examples/base/plot_baseclass1.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml index 5939928c..9b4286b7 100644 --- a/.github/workflows/python-ci.yml +++ b/.github/workflows/python-ci.yml @@ -63,7 +63,7 @@ jobs: Package_Testing: - runs-on: ubuntu-latest + runs-on: windows-latest if: "!contains(github.event.head_commit.message, '[ci skip]')" steps: diff --git a/Examples/base/plot_baseclass1.py b/Examples/base/plot_baseclass1.py index 3df2e859..fa0539c8 100644 --- a/Examples/base/plot_baseclass1.py +++ b/Examples/base/plot_baseclass1.py @@ -16,6 +16,7 @@ import matplotlib.pyplot as plt import numpy as np + from easyscience.Objects.ObjectClasses import BaseObj from easyscience.Objects.ObjectClasses import Parameter From fd976136166aae2b46d6944a86bd0beb819a7e4a Mon Sep 17 00:00:00 2001 From: rozyczko Date: Thu, 15 Aug 2024 15:15:36 +0200 Subject: [PATCH 3/3] pytest -> tox --- .github/workflows/python-ci.yml | 6 +++--- .github/workflows/python-package.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml index 9b4286b7..6d02c1cf 100644 --- a/.github/workflows/python-ci.yml +++ b/.github/workflows/python-ci.yml @@ -63,7 +63,7 @@ jobs: Package_Testing: - runs-on: windows-latest + runs-on: ubuntu-latest if: "!contains(github.event.head_commit.message, '[ci skip]')" steps: @@ -80,5 +80,5 @@ jobs: - name: Check Build run: | - cd ./dist - pytest ../ \ No newline at end of file + pip install tox tox-gh-actions coverage + tox diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 247dda84..ce27bb80 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -33,8 +33,8 @@ jobs: python -m build - name: Test with pytest run: | - cd ./dist - pytest ../ + pip install tox tox-gh-actions coverage + tox - uses: actions/upload-artifact@v4 with: name: EasyScience - Python ${{ matrix.python-version }}