From 671dc3a739201de6da111a7e30796a89560b2ee7 Mon Sep 17 00:00:00 2001 From: Andreas Motl Date: Tue, 5 Nov 2024 01:38:08 +0100 Subject: [PATCH 1/3] Python: Use v3.11 on CI. Python 3.8 has problems with new-style ns-pkgs --- Jenkinsfile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 69a79c4f..3d506791 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,7 +14,7 @@ pipeline { steps { checkout scm sh 'rm -rf env' - sh '/usr/bin/python3 -m venv env' + sh '/usr/bin/python3.11 -m venv env' sh 'env/bin/python -m pip install -U mypy flake8' sh 'find tests -name "*.py" | xargs env/bin/mypy --ignore-missing-imports' sh 'find src -name "*.py" | xargs env/bin/mypy --ignore-missing-imports' @@ -27,7 +27,7 @@ pipeline { checkout scm sh ''' rm -rf env - /usr/bin/python3 -m venv env + /usr/bin/python3.11 -m venv env source env/bin/activate python -m pip install -U -e . @@ -41,7 +41,7 @@ pipeline { checkout scm sh ''' rm -rf env - /usr/bin/python3 -m venv env + /usr/bin/python3.11 -m venv env source env/bin/activate python -m pip install -U -e . @@ -55,7 +55,7 @@ pipeline { checkout scm sh ''' rm -rf env - /usr/bin/python3 -m venv env + /usr/bin/python3.11 -m venv env source env/bin/activate python -m pip install -U -e . @@ -69,7 +69,7 @@ pipeline { checkout scm sh ''' rm -rf env - /usr/bin/python3 -m venv env + /usr/bin/python3.11 -m venv env source env/bin/activate python -m pip install -U -e . @@ -83,7 +83,7 @@ pipeline { checkout scm sh ''' rm -rf env - /usr/bin/python3 -m venv env + /usr/bin/python3.11 -m venv env source env/bin/activate python -m pip install -U -e . @@ -97,7 +97,7 @@ pipeline { checkout scm sh ''' rm -rf env - /usr/bin/python3 -m venv env + /usr/bin/python3.11 -m venv env source env/bin/activate python -m pip install -U -e . @@ -112,7 +112,7 @@ pipeline { checkout scm sh ''' rm -rf env - /usr/bin/python3 -m venv env + /usr/bin/python3.11 -m venv env source env/bin/activate python -m pip install -U -e . From 3567030b5bd633fb8fa69f012d49440956d4f697 Mon Sep 17 00:00:00 2001 From: Andreas Motl Date: Tue, 5 Nov 2024 01:23:15 +0100 Subject: [PATCH 2/3] Python: Migrate to use "implicit namespace packages" (PEP 420) --- setup.py | 1 - src/crate/__init__.py | 0 2 files changed, 1 deletion(-) create mode 100644 src/crate/__init__.py diff --git a/setup.py b/setup.py index 3477af24..32af20e6 100644 --- a/setup.py +++ b/setup.py @@ -28,7 +28,6 @@ def read(filename): }, package_dir={'': 'src'}, packages=['crate.qa'], - namespace_packages=['crate'], install_requires=[ 'crate', 'cr8>=0.25.0', diff --git a/src/crate/__init__.py b/src/crate/__init__.py new file mode 100644 index 00000000..e69de29b From 972ed89e35bc8a9329c0912194a96e5342c5356f Mon Sep 17 00:00:00 2001 From: Andreas Motl Date: Tue, 5 Nov 2024 00:15:54 +0100 Subject: [PATCH 3/3] Dependencies: Use crate>=1.0.0.dev2 for validation purposes --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 32af20e6..f240be68 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ def read(filename): package_dir={'': 'src'}, packages=['crate.qa'], install_requires=[ - 'crate', + 'crate>=1.0.0.dev2', 'cr8>=0.25.0', 'Cython', 'asyncpg>=0.21',