From c858191b50acfa5a36829cf0fcfd26023174d8d9 Mon Sep 17 00:00:00 2001 From: David Straub Date: Thu, 6 Feb 2025 08:10:59 +0000 Subject: [PATCH 1/3] Run CI unit tests with Python 3.9 and 3.13 --- .github/workflows/gramps-ci.yml | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/.github/workflows/gramps-ci.yml b/.github/workflows/gramps-ci.yml index 570d994b12..b5f5af49a0 100644 --- a/.github/workflows/gramps-ci.yml +++ b/.github/workflows/gramps-ci.yml @@ -29,9 +29,15 @@ jobs: build: runs-on: ubuntu-22.04 - + strategy: + matrix: + python-version: ["3.9", "3.13"] steps: - uses: actions/checkout@v4 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v5 + with: + python-version: ${{ matrix.python-version }} - name: Install dependencies run: | sudo apt-get update @@ -41,22 +47,11 @@ jobs: sudo apt-get install librsvg2-common sudo apt-get install libglib2.0-dev sudo apt-get install intltool - sudo apt-get install python3-gi - sudo apt-get install python3-cairo - sudo apt-get install python3-gi-cairo - sudo apt-get install python3-bsddb3 - sudo apt-get install python3-dev - sudo apt-get install python3-nose - sudo apt-get install python3-mock - sudo apt-get install python3-icu - sudo apt-get install python3-coverage - sudo apt-get install python3-jsonschema - sudo apt-get install libxml2-utils - sudo apt-get install python3-lxml - sudo apt-get install python3-libxml2 sudo apt-get install zlib1g-dev - sudo apt-get install python3-setuptools - python3 -m pip install orjson + sudo apt-get install libgirepository1.0-dev + sudo apt-get install libicu-dev + python3 -m pip install --upgrade pip setuptools build wheel + python3 -m pip install orjson Pillow PyICU PyGObject pycairo jsonschema mock lxml - name: Install addons run: | mkdir -p ~/.gramps/gramps60/plugins/ From f38efdbe7f9d1351f74a59e21dd709b47c15aadc Mon Sep 17 00:00:00 2001 From: Nick Hall Date: Fri, 7 Feb 2025 15:36:03 +0000 Subject: [PATCH 2/3] Run with --durations 0 option --- .github/workflows/gramps-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gramps-ci.yml b/.github/workflows/gramps-ci.yml index b5f5af49a0..d7d6a9f5c3 100644 --- a/.github/workflows/gramps-ci.yml +++ b/.github/workflows/gramps-ci.yml @@ -31,7 +31,7 @@ jobs: runs-on: ubuntu-22.04 strategy: matrix: - python-version: ["3.9", "3.13"] + python-version: ["3.13"] steps: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} @@ -69,4 +69,5 @@ jobs: - name: Run unit test suite run: | export GDK_BACKEND=- - python3 setup.py test + export GRAMPS_RESOURCES=. + python3 -m unittest discover --durations 0 -p "*_test.py" From d1d9b064d48c83bd1d05f79210204eaf86b98be2 Mon Sep 17 00:00:00 2001 From: Nick Hall Date: Thu, 13 Feb 2025 20:44:55 +0000 Subject: [PATCH 3/3] Try with Ubuntu 24.04 --- .github/workflows/gramps-ci.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gramps-ci.yml b/.github/workflows/gramps-ci.yml index d7d6a9f5c3..07fd6cdaff 100644 --- a/.github/workflows/gramps-ci.yml +++ b/.github/workflows/gramps-ci.yml @@ -28,10 +28,10 @@ on: jobs: build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: matrix: - python-version: ["3.13"] + python-version: ["3.9", "3.12"] steps: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} @@ -50,6 +50,9 @@ jobs: sudo apt-get install zlib1g-dev sudo apt-get install libgirepository1.0-dev sudo apt-get install libicu-dev + sudo apt-get install libcairo2-dev + sudo apt-get install libpython3-dev + sudo apt-get install python3-dev python3 -m pip install --upgrade pip setuptools build wheel python3 -m pip install orjson Pillow PyICU PyGObject pycairo jsonschema mock lxml - name: Install addons @@ -70,4 +73,4 @@ jobs: run: | export GDK_BACKEND=- export GRAMPS_RESOURCES=. - python3 -m unittest discover --durations 0 -p "*_test.py" + python3 -m unittest discover -p "*_test.py"