From f9e1f1ae7f7c423ba36348eb6873296c4cf7ba8e Mon Sep 17 00:00:00 2001 From: hnformentin Date: Mon, 5 Dec 2022 10:59:58 +0100 Subject: [PATCH] Drop support for python 3.6 and 3.7 --- .github/workflows/style.yml | 2 +- .github/workflows/testing.yml | 15 +-------------- WINDOWS.md | 2 +- ci/github/build_linux_wheel.sh | 2 -- setup.py | 2 -- 5 files changed, 3 insertions(+), 20 deletions(-) diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml index e5c7ffd8af..93df0a8fa5 100644 --- a/.github/workflows/style.yml +++ b/.github/workflows/style.yml @@ -13,7 +13,7 @@ jobs: - name: Install dependencies run: | - sudo pip install cmake-format black==22.1.0 'click<8;python_version<="3.6"' 'click==8.0.2;python_version >"3.6"' + sudo pip install cmake-format black==22.1.0 - name: Clang Format run: ./script/clang-format --check diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index e347141b96..e76639673e 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -47,7 +47,7 @@ jobs: fail-fast: false matrix: os: ['ubuntu-latest', 'macos-latest'] - python: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11'] + python: ['3.8', '3.9', '3.10', '3.11'] runs-on: ${{ matrix.os }} @@ -79,19 +79,6 @@ jobs: name: ${{ matrix.os }} Python ${{ matrix.python }} wheel path: dist/* - - name: Build `libecl` migration package - run: | - pip install -U pip setuptools wheel setuptools_scm - python ci/github/setup.py bdist_wheel --dist-dir=dist-migration - if: matrix.os == 'ubuntu-latest' && matrix.python == '3.6' - - - name: Upload `libecl` migration wheel as artifact - uses: actions/upload-artifact@v2 - with: - name: Python libecl to ecl wheel - path: dist-migration/* - if: matrix.os == 'ubuntu-latest' && matrix.python == '3.6' - - name: Install ecl run: pip install dist/* diff --git a/WINDOWS.md b/WINDOWS.md index 2bfb46b95b..7d0ab2ebc4 100644 --- a/WINDOWS.md +++ b/WINDOWS.md @@ -22,6 +22,6 @@ cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_INSTALL_PREFIX=%INSTALLPATH% -DBUILD_SHARED_LIBS="ON" -DENABLE_PYTHON="ON" -DCMAKE_BUILD_TYPE="Release" %SOURCEPATH% cmake --build %BUILDPATH% --config Release --target install ~~~~ -6. For **_libecl_** to be accessible in Python the `%INSTALLPATH%\lib\pythonX.Y\site-package` and Python subdirectories must be added to the `PATH` and `PYTHONPATH` variables. Where `pythonx.y` is the current Python version _e.g._ (`python2.7`, `python3.6` _etc._) . +6. For **_libecl_** to be accessible in Python the `%INSTALLPATH%\lib\pythonX.Y\site-package` and Python subdirectories must be added to the `PATH` and `PYTHONPATH` variables. Where `pythonx.y` is the current Python version _e.g._ (`python3.9`, `python3.10` _etc._) . 8. Open a Python interactive session and run `import ecl` to check that the install and paths are now set. \ No newline at end of file diff --git a/ci/github/build_linux_wheel.sh b/ci/github/build_linux_wheel.sh index 48e48f9646..36ed98dcdb 100755 --- a/ci/github/build_linux_wheel.sh +++ b/ci/github/build_linux_wheel.sh @@ -2,8 +2,6 @@ set -euo pipefail case "$1" in - 3.6) pyver=cp36-cp36m ;; - 3.7) pyver=cp37-cp37m ;; 3.8) pyver=cp38-cp38 ;; 3.9) pyver=cp39-cp39 ;; 3.10) pyver=cp310-cp310 ;; diff --git a/setup.py b/setup.py index d9a061d043..32a08ecfe7 100644 --- a/setup.py +++ b/setup.py @@ -104,8 +104,6 @@ def utility_wrappers(): "License :: OSI Approved :: GNU General Public License v3 (GPLv3)", "Natural Language :: English", "Programming Language :: Python", - "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",