Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/pi-hole/pi-hole.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryubiuser <ckoenig@posteo.de>2022-09-17 17:13:48 +0300
committerGitHub <noreply@github.com>2022-09-17 17:13:48 +0300
commit7eff36b3bb075b1f82e49a766f208b5d9fdcf720 (patch)
treeeeda5ffbfb3782e4b337c3e0a9ebf5c2264a14fb
parent5332b31b92676a1a4886ab84d3a0c368e980c87c (diff)
parent8bc5b16527094ea823b4a6d536b26b7b5b2c7efb (diff)
Update workflow python to 3.10 and allow any python3 version in tests (#4914)
-rw-r--r--.github/workflows/test.yml4
-rw-r--r--test/setup.py1
-rw-r--r--test/tox.centos_8.ini2
-rw-r--r--test/tox.debian_10.ini2
-rw-r--r--test/tox.debian_11.ini2
-rw-r--r--test/tox.fedora_34.ini2
-rw-r--r--test/tox.ubuntu_20.ini2
-rw-r--r--test/tox.ubuntu_22.ini2
8 files changed, 9 insertions, 8 deletions
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 318cfcc4..7725ecc3 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -51,10 +51,10 @@ jobs:
name: Checkout repository
uses: actions/checkout@v3.0.2
-
- name: Set up Python 3.8
+ name: Set up Python 3.10
uses: actions/setup-python@v4.2.0
with:
- python-version: 3.8
+ python-version: '3.10'
-
name: Install dependencies
run: pip install -r test/requirements.txt
diff --git a/test/setup.py b/test/setup.py
index 0e393bc1..9f3b4b48 100644
--- a/test/setup.py
+++ b/test/setup.py
@@ -1,6 +1,7 @@
from setuptools import setup
setup(
+ py_modules=[],
setup_requires=['pytest-runner'],
tests_require=['pytest'],
)
diff --git a/test/tox.centos_8.ini b/test/tox.centos_8.ini
index e94c2433..71b147c7 100644
--- a/test/tox.centos_8.ini
+++ b/test/tox.centos_8.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = py38
+envlist = py3
[testenv]
whitelist_externals = docker
diff --git a/test/tox.debian_10.ini b/test/tox.debian_10.ini
index 3b182cdc..d21620dc 100644
--- a/test/tox.debian_10.ini
+++ b/test/tox.debian_10.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = py38
+envlist = py3
[testenv]
whitelist_externals = docker
diff --git a/test/tox.debian_11.ini b/test/tox.debian_11.ini
index c7e41a91..f2546922 100644
--- a/test/tox.debian_11.ini
+++ b/test/tox.debian_11.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = py38
+envlist = py3
[testenv]
whitelist_externals = docker
diff --git a/test/tox.fedora_34.ini b/test/tox.fedora_34.ini
index 26856984..f4115a66 100644
--- a/test/tox.fedora_34.ini
+++ b/test/tox.fedora_34.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = py38
+envlist = py3
[testenv]
whitelist_externals = docker
diff --git a/test/tox.ubuntu_20.ini b/test/tox.ubuntu_20.ini
index fb3d20d7..80fb7485 100644
--- a/test/tox.ubuntu_20.ini
+++ b/test/tox.ubuntu_20.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = py38
+envlist = py3
[testenv]
whitelist_externals = docker
diff --git a/test/tox.ubuntu_22.ini b/test/tox.ubuntu_22.ini
index 2a3285aa..41007a9c 100644
--- a/test/tox.ubuntu_22.ini
+++ b/test/tox.ubuntu_22.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = py38
+envlist = py3
[testenv]
whitelist_externals = docker