From c41b43a5953fdc1fc2eb2ba1f480bc3bd30d1791 Mon Sep 17 00:00:00 2001 From: Tushar Goel Date: Wed, 8 Feb 2023 16:53:43 +0530 Subject: [PATCH 1/6] Drop python 3.6 and use 3.11 Signed-off-by: Tushar Goel --- .travis.yml | 3 ++- azure-pipelines.yml | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6757de4a..da6ccdcf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,10 +10,11 @@ dist: xenial language: python python: - - "3.6" - "3.7" - "3.8" - "3.9" + - "3.10" + - "3.11" # Scripts to run at install stage install: | diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0b566489..6610396b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -11,7 +11,7 @@ jobs: parameters: job_name: ubuntu18_cpython image_name: ubuntu-18.04 - python_versions: ['3.6', '3.7', '3.8', '3.9', '3.10'] + python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11'] test_suites: all: | source venv/bin/activate @@ -21,7 +21,7 @@ jobs: parameters: job_name: ubuntu20_cpython image_name: ubuntu-20.04 - python_versions: ['3.6', '3.7', '3.8', '3.9', '3.10'] + python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11'] test_suites: all: | source venv/bin/activate @@ -31,7 +31,7 @@ jobs: parameters: job_name: macos1015_cpython image_name: macos-10.15 - python_versions: ['3.6', '3.7', '3.8', '3.9', '3.10'] + python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11'] test_suites: all: | source venv/bin/activate @@ -41,7 +41,7 @@ jobs: parameters: job_name: macos11_cpython image_name: macos-11 - python_versions: ['3.7', '3.8', '3.9', '3.10'] + python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11'] test_suites: all: | source venv/bin/activate @@ -51,7 +51,7 @@ jobs: parameters: job_name: win2019_cpython image_name: windows-2019 - python_versions: ['3.6', '3.7', '3.8', '3.9', '3.10'] + python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11'] test_suites: all: | call venv\Scripts\activate.bat @@ -61,7 +61,7 @@ jobs: parameters: job_name: win2022_cpython image_name: windows-2022 - python_versions: ['3.7', '3.8', '3.9', '3.10'] + python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11'] test_suites: all: | call venv\Scripts\activate.bat From 8b5dd75c3b6ff926b3c5e864a7d63dacfea80bf7 Mon Sep 17 00:00:00 2001 From: Tushar Goel Date: Wed, 8 Feb 2023 16:56:02 +0530 Subject: [PATCH 2/6] Update python_requires Signed-off-by: Tushar Goel --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index d6bc1084..046ad1a1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -54,7 +54,7 @@ zip_safe = false setup_requires = setuptools_scm[toml] >= 4 -python_requires = >=3.6.* +python_requires = >=3.7 install_requires = attrs From 9444c5af32a159b58586edcfe614a212ec9907c5 Mon Sep 17 00:00:00 2001 From: Tushar Goel Date: Wed, 8 Feb 2023 17:12:44 +0530 Subject: [PATCH 3/6] Update pytest to 7.2.0 Signed-off-by: Tushar Goel --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 2f4c61da..6cc2fbdd 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -3,7 +3,7 @@ importlib-metadata==4.8.1 iniconfig==1.1.1 pluggy==1.0.0 py==1.10.0 -pytest==6.2.5 +pytest==7.2.0 pytest-forked==1.3.0 pytest-xdist==2.4.0 toml==0.10.2 From f9db7272259190ece6446fd95540eca56b2d98e8 Mon Sep 17 00:00:00 2001 From: Tushar Goel Date: Wed, 8 Feb 2023 17:28:03 +0530 Subject: [PATCH 4/6] Update pytest-dev packages Signed-off-by: Tushar Goel --- requirements-dev.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 6cc2fbdd..82a59db3 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -2,10 +2,10 @@ execnet==1.9.0 importlib-metadata==4.8.1 iniconfig==1.1.1 pluggy==1.0.0 -py==1.10.0 +py==1.11.0 pytest==7.2.0 -pytest-forked==1.3.0 -pytest-xdist==2.4.0 +pytest-forked==1.4.0 +pytest-xdist==3.2.0 toml==0.10.2 typing-extensions==3.10.0.2 zipp==3.6.0 From 7e6e9bfe869a73230b7a75fbfa19632ea3b6fbe5 Mon Sep 17 00:00:00 2001 From: Tushar Goel Date: Wed, 8 Feb 2023 18:09:48 +0530 Subject: [PATCH 5/6] Fix UnicodeEncodeError Signed-off-by: Tushar Goel --- tests/test_rpm_vercmp.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/test_rpm_vercmp.py b/tests/test_rpm_vercmp.py index e3143a7c..785ff37a 100644 --- a/tests/test_rpm_vercmp.py +++ b/tests/test_rpm_vercmp.py @@ -74,7 +74,9 @@ def create_test_function(ver1, ver2, expected, name): """ def test_rpm_version(self): - print(f"testing (ver1={ver1}, ver2={ver2}, expected=expected{expected}") + ver1_str = str(ver1).encode("utf-8") + ver2_str = str(ver2).encode("utf-8") + print(f"testing (ver1={ver1_str}, ver2={ver2_str}, expected=expected{expected}") result = vercmp.vercmp(ver1, ver2) if result != expected: assert result == (expected, ver1, ver2) From dab9c9a350c53ab68bcf78f2f90d20a188357ba8 Mon Sep 17 00:00:00 2001 From: Tushar Goel Date: Wed, 8 Feb 2023 18:10:01 +0530 Subject: [PATCH 6/6] Drop travis CI Signed-off-by: Tushar Goel --- .travis.yml | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index da6ccdcf..00000000 --- a/.travis.yml +++ /dev/null @@ -1,25 +0,0 @@ -# This is a skeleton Travis CI config file that provides a starting point for adding CI -# to a Python project. Since we primarily develop in python3, this skeleton config file -# will be specific to that language. -# -# See https://config.travis-ci.com/ for a full list of configuration options. - -os: linux - -dist: xenial - -language: python -python: - - "3.7" - - "3.8" - - "3.9" - - "3.10" - - "3.11" - -# Scripts to run at install stage -install: | - ./configure --dev - source venv/bin/activate - -# Scripts to run at script stage -script: pytest