From 0c30bfb037b9ded758f9babd2d3944c5c9168f1b Mon Sep 17 00:00:00 2001 From: Adam Kariv Date: Tue, 18 Mar 2025 12:15:19 +0200 Subject: [PATCH 1/8] build upgrade --- .github/workflows/general.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/general.yml b/.github/workflows/general.yml index 8f519c7..c466615 100644 --- a/.github/workflows/general.yml +++ b/.github/workflows/general.yml @@ -15,10 +15,10 @@ jobs: # Test test-linux: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 strategy: matrix: - python-version: ['3.7.15', '3.8.16', '3.9.16', '3.10.10', '3.11.2'] + python-version: ['3.7.15', '3.8.16', '3.9.16', '3.10.10', '3.11.2', '3.12.1'] plyvel: ['true', 'false'] steps: - name: Checkout repository From 460d51ff0e3fbaf5d6eb2ef884d869f71d40251d Mon Sep 17 00:00:00 2001 From: Adam Kariv Date: Tue, 18 Mar 2025 12:18:34 +0200 Subject: [PATCH 2/8] Allow tests on other branches as well --- .github/workflows/general.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/general.yml b/.github/workflows/general.yml index c466615..a721d15 100644 --- a/.github/workflows/general.yml +++ b/.github/workflows/general.yml @@ -2,8 +2,6 @@ name: general on: push: - branches: - - master tags: - '*.*.*' pull_request: From 2f146e5c83a03ef3c06ebde1b9644635a928a110 Mon Sep 17 00:00:00 2001 From: Adam Kariv Date: Tue, 18 Mar 2025 12:20:00 +0200 Subject: [PATCH 3/8] Allow tests on other branches as well --- .github/workflows/general.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/general.yml b/.github/workflows/general.yml index a721d15..63732e8 100644 --- a/.github/workflows/general.yml +++ b/.github/workflows/general.yml @@ -2,6 +2,8 @@ name: general on: push: + branches: + - '*' tags: - '*.*.*' pull_request: @@ -33,8 +35,8 @@ jobs: make install - name: Test software run: make test - - name: Report coverage - uses: codecov/codecov-action@v1 + # - name: Report coverage + # uses: codecov/codecov-action@v1 # Release From f9ae851ce67dfddd677ba00ad8cac8895e4b45d9 Mon Sep 17 00:00:00 2001 From: Adam Kariv Date: Tue, 18 Mar 2025 12:21:58 +0200 Subject: [PATCH 4/8] Verbose tests --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e2c24f7..2dd98ce 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ release: test: pylama $(PACKAGE) - py.test -s --cov dataflows --cov-report term-missing + py.test -vvv -s --cov dataflows --cov-report term-missing version: @echo $(VERSION) From f33e80bfb16a41561193e5ec480831a33d8496a3 Mon Sep 17 00:00:00 2001 From: Adam Kariv Date: Tue, 18 Mar 2025 12:23:14 +0200 Subject: [PATCH 5/8] Ubuntu version --- .github/workflows/general.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/general.yml b/.github/workflows/general.yml index 63732e8..17c50aa 100644 --- a/.github/workflows/general.yml +++ b/.github/workflows/general.yml @@ -15,7 +15,7 @@ jobs: # Test test-linux: - runs-on: ubuntu-24.04 + runs-on: ubuntu-22.04 strategy: matrix: python-version: ['3.7.15', '3.8.16', '3.9.16', '3.10.10', '3.11.2', '3.12.1'] From 911d81bbc38f90b112dd2b887d85d548cf8e1663 Mon Sep 17 00:00:00 2001 From: Adam Kariv Date: Tue, 18 Mar 2025 12:28:53 +0200 Subject: [PATCH 6/8] Fix pylama install --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index ea43d3c..66d2e10 100644 --- a/setup.py +++ b/setup.py @@ -43,6 +43,7 @@ def read(*paths): 'pylama', 'pylama_quotes', 'pyflakes<2.5', + 'setuptools', ] TESTS_REQUIRE = [ 'mock', From 7d02eecffb39b1d3a0ae8d1e7765cdd6fdeab9d4 Mon Sep 17 00:00:00 2001 From: Adam Kariv Date: Tue, 18 Mar 2025 12:35:02 +0200 Subject: [PATCH 7/8] Fix pylama install --- .github/workflows/general.yml | 1 + setup.py | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/general.yml b/.github/workflows/general.yml index 17c50aa..bfc9e3c 100644 --- a/.github/workflows/general.yml +++ b/.github/workflows/general.yml @@ -31,6 +31,7 @@ jobs: env: PLYVEL: ${{ matrix.plyvel }} run: | + sudo apt-get install --reinstall python-pkg-resources [ "${PLYVEL}" != "true" ] || (echo installing plyvel && sudo apt-get install libleveldb-dev libleveldb1d libsnappy-dev && pip install plyvel) make install - name: Test software diff --git a/setup.py b/setup.py index 66d2e10..ea43d3c 100644 --- a/setup.py +++ b/setup.py @@ -43,7 +43,6 @@ def read(*paths): 'pylama', 'pylama_quotes', 'pyflakes<2.5', - 'setuptools', ] TESTS_REQUIRE = [ 'mock', From a7c0d82c84043bd051c8c1f92e24473e75dced39 Mon Sep 17 00:00:00 2001 From: Adam Kariv Date: Tue, 18 Mar 2025 12:36:43 +0200 Subject: [PATCH 8/8] Revert "Fix pylama install" This reverts commit 7d02eecffb39b1d3a0ae8d1e7765cdd6fdeab9d4. --- .github/workflows/general.yml | 1 - setup.py | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/general.yml b/.github/workflows/general.yml index bfc9e3c..17c50aa 100644 --- a/.github/workflows/general.yml +++ b/.github/workflows/general.yml @@ -31,7 +31,6 @@ jobs: env: PLYVEL: ${{ matrix.plyvel }} run: | - sudo apt-get install --reinstall python-pkg-resources [ "${PLYVEL}" != "true" ] || (echo installing plyvel && sudo apt-get install libleveldb-dev libleveldb1d libsnappy-dev && pip install plyvel) make install - name: Test software diff --git a/setup.py b/setup.py index ea43d3c..66d2e10 100644 --- a/setup.py +++ b/setup.py @@ -43,6 +43,7 @@ def read(*paths): 'pylama', 'pylama_quotes', 'pyflakes<2.5', + 'setuptools', ] TESTS_REQUIRE = [ 'mock',