This is an automated email from the ASF dual-hosted git repository. astitcher pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/qpid-proton.git
commit 129884152ab8713a0a2243a173dbdf8f868963fc Author: Andrew Stitcher <[email protected]> AuthorDate: Fri Jan 6 11:59:48 2023 -0500 PROTON-2668: Update python minimum to python 3.8 --- .appveyor.yml | 6 +++--- .github/workflows/build.yml | 4 ++-- CMakeLists.txt | 2 +- INSTALL.md | 4 +--- azure-pipelines/azure-pipelines.yml | 3 +-- azure-pipelines/steps.yml | 2 +- python/setup.cfg | 2 -- python/tox.ini | 2 +- 8 files changed, 10 insertions(+), 15 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index c01f89844..f16cffccd 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -7,21 +7,21 @@ environment: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 CMAKE_GENERATOR: Visual Studio 16 2019 # TODO (jdanek) upgrade to Python 38 when it can be made to work; or whichever is latest at the time - PYTHON: "C:\\Python37-x64" + PYTHON: "C:\\Python38-x64" QPID_PROTON_CMAKE_ARGS: "-A x64" VCPKG_INTEGRATION: '-DCMAKE_TOOLCHAIN_FILE=C:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake' VCPKG_DEFAULT_TRIPLET: x64-windows - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 CMAKE_GENERATOR: Visual Studio 15 2017 CONFIGURATION: MinSizeRel - PYTHON: "C:\\Python37-x64" + PYTHON: "C:\\Python38-x64" QPID_PROTON_CMAKE_ARGS: "-A x64" QPID_PROTON_CTEST_ARGS: "-E tox" VCPKG_INTEGRATION: '-DCMAKE_TOOLCHAIN_FILE=C:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake' VCPKG_DEFAULT_TRIPLET: x64-windows - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 CMAKE_GENERATOR: Visual Studio 14 2015 - PYTHON: "C:\\Python36-x64" + PYTHON: "C:\\Python38-x64" QPID_PROTON_CMAKE_ARGS: "-A x64" # vcpkg is supported on VS2015, we are just not enabling the CMake integration # https://docs.microsoft.com/en-us/cpp/build/vcpkg?view=vs-2015 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4395d1cca..0e80d3a72 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,12 +41,12 @@ jobs: - name: Setup python uses: actions/setup-python@v3 with: - python-version: 3.6 + python-version: 3.9 architecture: x64 - name: Install python dependencies run: | python -m pip install --upgrade pip - python -m pip install setuptools wheel tox flake8 + python -m pip install --upgrade setuptools wheel tox flake8 - name: Install Linux dependencies if: runner.os == 'Linux' run: | diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c075dad9..e6f94ab2c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,7 +42,7 @@ endif () if (NOT DEFINED Python_FIND_FRAMEWORK) set(Python_FIND_FRAMEWORK "LAST") endif () -find_package(Python 3.6 +find_package(Python 3.8 REQUIRED COMPONENTS Interpreter OPTIONAL_COMPONENTS Development) diff --git a/INSTALL.md b/INSTALL.md index 60676235d..9e06b120e 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -10,7 +10,7 @@ Dependencies Cross-platform dependencies - CMake 2.8.12+ - - Python (required to build core C library, minimum version depends on platform) + - Python 3.8+ (required to build core C library) - Swig 1.3+ (for the bindings) - Ruby 1.9+ (for the Ruby binding) - Go 1.11+ (for the Go binding) @@ -22,12 +22,10 @@ Linux dependencies - Cyrus SASL 2.1+ (for SASL support) - OpenSSL 1.0+ (for SSL support) - JsonCpp 1.8+ for C++ connection configuration file support - - Python 2.7, 3.5+ (for the Python binding) Windows dependencies - Visual Studio 2015 or newer (regular or C++ Express) - - Python 3.5+ (for the Python binding) CMake (Linux) ------------- diff --git a/azure-pipelines/azure-pipelines.yml b/azure-pipelines/azure-pipelines.yml index f8216e5b4..5c20c17b0 100644 --- a/azure-pipelines/azure-pipelines.yml +++ b/azure-pipelines/azure-pipelines.yml @@ -8,7 +8,7 @@ # variables: Config: 'RelWithDebInfo' - PythonVersion: '3.7' + PythonVersion: '3.9' PythonArch: 'x64' CmakeConfigExtraArgs: '' CmakeGenerator: '-G "Unix Makefiles"' @@ -41,7 +41,6 @@ jobs: - template: steps.yml - job: MacOS variables: - PythonVersion: '3.6' PKG_CONFIG_PATH: '/usr/local/opt/[email protected]/lib/pkgconfig' CmakeConfigExtraArgs: '-DBUILD_RUBY=no' pool: diff --git a/azure-pipelines/steps.yml b/azure-pipelines/steps.yml index 66b81b7ad..821f85ddf 100644 --- a/azure-pipelines/steps.yml +++ b/azure-pipelines/steps.yml @@ -6,7 +6,7 @@ steps: architecture: $(PythonArch) - script: | python -m pip install --user --upgrade pip - python -m pip install --user setuptools wheel tox flake8 + python -m pip install --user --upgrade setuptools wheel tox flake8 name: InstallPythonModules - task: CMake@1 name: CMakeConfigure diff --git a/python/setup.cfg b/python/setup.cfg index 14b31e3bf..30ddffdcb 100644 --- a/python/setup.cfg +++ b/python/setup.cfg @@ -12,8 +12,6 @@ classifiers = Programming Language :: Python Programming Language :: Python :: 3 Programming Language :: Python :: 3 :: Only - Programming Language :: Python :: 3.6 - Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 diff --git a/python/tox.ini b/python/tox.ini index 75ca0610b..8c122344f 100644 --- a/python/tox.ini +++ b/python/tox.ini @@ -1,6 +1,6 @@ [tox] # This will be overridden by ctest setting TOXENV for anything but this default -envlist = py36,py37,py38,py39,py310,py311 +envlist = py38,py39,py310,py311 minversion = 1.7.2 skip_missing_interpreters = True --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
