Upgrades (#208)

Author: pkittenis

Diff for: .appveyor.yml

@@ -32,7 +32,7 @@ environment:
     PYTHON_DEF: "C:\\Python38-x64"
     PYTHON_VERSION: "3.8"
     # Python versions to build wheels for
-    PYTHONVERS: C:\Python36-x64 C:\Python37-x64 C:\Python38-x64 C:\Python39-x64 C:\Python310-x64
+    PYTHONVERS: C:\Python38-x64 C:\Python39-x64 C:\Python310-x64 C:\Python311-x64 C:\Python312-x64
     PYTHON_ARCH: "64"
     MSVC: "Visual Studio 16 2019"
 
@@ -46,7 +46,7 @@ install:
         https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | `
         Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { `
           throw "There are newer queued builds for this pull request, failing early." }
-  - set OPENSSL_DIR="C:\OpenSSL-v11-Win%PYTHON_ARCH%"
+  - set OPENSSL_DIR="C:\OpenSSL-v34-Win64"
   - set VCLIBDIR=%WINDIR%\System32
   - cp %VCLIBDIR%/vcruntime*.dll ssh2/
   - cp %VCLIBDIR%/msvcp*.dll ssh2/
@@ -65,27 +65,16 @@ install:
   - 7z x ci\appveyor\zlib1211.zip
 
 build_script:
+  - dir %OPENSSL_DIR%\lib\VC\x64\MD
   - ci\\appveyor\\build_zlib.bat
   - for %%I in (%PYTHONVERS%) do cp C:/zlib/lib/zlibstatic.lib %%I/libs/
   - for %%I in (%PYTHONVERS%) do ls %%I/libs/
   - ci\\appveyor\\build_ssh2.bat
   - for %%I in (%PYTHONVERS%) do cp build_dir/src/libssh2.lib %%I/libs/ || cp build_dir/src/Release/libssh2.lib %%I/libs/
   - rm -f ssh2/*.c
-  - ps: ls ssh2
-  - for %%I in (%PYTHONVERS%) do %%I\python.exe -V
-  - for %%I in (%PYTHONVERS%) do %%I\python.exe setup.py build_ext
-  - for %%I in (%PYTHONVERS%) do %%I\python.exe setup.py build
-  - for %%I in (%PYTHONVERS%) do %%I\python.exe setup.py install
-  - ps: ls ssh2
 
 test_script:
-  - cd dist
-  - for %%I in (%PYTHONVERS%) do %%I\python.exe -c "from ssh2.session import Session; Session()"
-  - cd ..
-
-after_test:
-  - for %%I in (%PYTHONVERS%) do %%I\python.exe setup.py bdist_wheel
-  - mv dist/* .
+  - ci\\appveyor\\build_package.bat
 
 artifacts:
   - path: "*.whl"

Diff for: .circleci/config.yml

@@ -15,33 +15,26 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 version: 2.1
 
-orbs:
-  python: circleci/[email protected]
 
 jobs:
   python_test:
     parameters:
       python_ver:
         type: string
-        default: "3.6"
+        default: "3.10"
     docker:
-      - image: circleci/python:<< parameters.python_ver >>
+      - image: cimg/python:<< parameters.python_ver >>
     steps:
       - checkout
-      - python/load-cache:
-          dependency-file: requirements_dev.txt
-          key: depsv3-{{ .Branch }}.{{ arch }}-PY<< parameters.python_ver >>
       - run:
           name: Deps
           command: |
             sudo apt-get update
             sudo apt-get install cmake openssh-server
             pip install -r requirements_dev.txt
-      - python/save-cache:
-          dependency-file: requirements_dev.txt
-          key: depsv3-{{ .Branch }}.{{ arch }}-PY<< parameters.python_ver >>
       - run:
           command: |
+            pip uninstall -y cython
             python setup.py build_ext --inplace
             eval "$(ssh-agent -s)"
           name: Build
@@ -50,20 +43,32 @@ jobs:
             set -x
             ls -lhtr ssh2/
             pwd
-            pytest tests
+            python -m pytest tests
+          name: Test
+      - run:
+          command: |
+            python -m pytest ci/integration_tests
+          name: Integration
+      - run:
+          command: |
             flake8 ssh2
+          name: Flake
+      - run:
+          command: |
             python setup.py sdist
             cd dist; pip install *; python -c 'from ssh2.session import Session; Session()'; cd ..
+          name: Sdist Install
+      - run:
+          command: |
             cd doc
             make html
             cd ..
-          name: Test
+          name: Docs
 
   osx:
     parameters:
       xcode_ver:
         type: string
-        default: "11.6.0"
     macos:
       xcode: << parameters.xcode_ver >>
     environment:
@@ -75,6 +80,8 @@ jobs:
           name: deps
           command: |
             brew install cmake git-lfs python libssh2
+            brew link --force openssl
+            brew link --force libssh2
             pip3 install twine
             which twine
       - run:
@@ -90,12 +97,9 @@ jobs:
 
   manylinux-x86_64:
     machine:
-      image: ubuntu-2004:202201-02
+      image: ubuntu-2004:current
     steps: &manylinux-steps
       - checkout
-      - python/load-cache:
-          key: manylinuxdepsv6-{{ .Branch }}.{{ arch }}
-          dependency-file: requirements_dev.txt
       - run:
           name: Git LFS
           command: |
@@ -110,11 +114,7 @@ jobs:
             pip install -U pip
             pip install twine
             which twine
-            which python
             which python3
-      - python/save-cache:
-          key: manylinuxdepsv6-{{ .Branch }}.{{ arch }}
-          dependency-file: requirements_dev.txt
       - run:
           name: Build Wheels
           command: |
@@ -134,22 +134,22 @@ jobs:
 
   manylinux2014-aarch64:
     machine:
-      image: ubuntu-2004:202101-01
+      image: ubuntu-2004:current
     resource_class: arm.medium
     steps: *manylinux-steps
 
 workflows:
-  version: 2.1
+  version: 2
   main:
     jobs:
       - python_test:
           matrix:
             parameters:
               python_ver:
-                - "3.6"
                 - "3.8"
-                - "3.9"
                 - "3.10"
+                - "3.11"
+                - "3.12"
           filters:
             tags:
               ignore: /.*/
@@ -166,7 +166,8 @@ workflows:
             parameters:
               xcode_ver:
                 - "14.0.0"
-                - "13.1.0"
+                - "15.0.0"
+                - "16.0.0"
           filters:
             tags:
               only: /.*/

Diff for: .gitattributes

@@ -6,3 +6,4 @@ zlib1211.zip filter=lfs diff=lfs merge=lfs -text
 *.rpm filter=lfs diff=lfs merge=lfs -text
 ci/docker/manylinux/libssh2.tar.gz filter=lfs diff=lfs merge=lfs -text
 ci/docker/manylinux/cmake-2.8.11.1-5.4.x86_64.rpm filter=lfs diff=lfs merge=lfs -text
+ssh2/_version.py export-subst

Diff for: Changelog.rst

@@ -1,6 +1,24 @@
 Change Log
 =============
 
+1.1.0 (unreleased)
+++++++++++++++++++
+
+Changes
+--------
+
+* Support for Python >=3.12.
+* Upgraded embedded and wheel ``libssh2`` to ``1.11.1``.
+* Upgraded wheel OpenSSL to 3.4.0.
+* Removed testing for Python versions <3.8.
+
+Packaging
+----------
+
+* Added binary wheels for Python versions 3.11, 3.12.
+* Added OSX 12.0 and 13.0 wheels, Apple Silicon.
+
+
 1.0.0
 ++++++
 

Diff for: MANIFEST.in

@@ -3,7 +3,8 @@ recursive-exclude docker *
 include _setup_libssh2.py
 include versioneer.py
 include ssh2/_version.py
-recursive-exclude .circleci
+recursive-exclude .circleci *
+recursive-exclude ci *
 include LICENSE
 include ssh2/*.pyx
 include ssh2/*.pxd

Diff for: _setup_libssh2.py

@@ -14,11 +14,11 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 import os
-
-from sys import stderr
-from subprocess import check_call
 from glob import glob
 from shutil import copy2
+from subprocess import check_call
+
+from sys import stderr
 
 
 def build_ssh2():
@@ -27,12 +27,14 @@ def build_ssh2():
         return
     if os.path.exists('/usr/local/opt/openssl'):
         os.environ['OPENSSL_ROOT_DIR'] = '/usr/local/opt/openssl'
+    if os.path.exists('/opt/homebrew/opt/openssl'):
+        os.environ['OPENSSL_ROOT_DIR'] = '/opt/homebrew/opt/openssl'
 
     if not os.path.exists('build_dir'):
         os.mkdir('build_dir')
 
     os.chdir('build_dir')
-    check_call('cmake ../libssh2/libssh2 -DBUILD_SHARED_LIBS=ON \
+    check_call('cmake ../libssh2 -DBUILD_SHARED_LIBS=ON \
     -DENABLE_ZLIB_COMPRESSION=ON -DENABLE_CRYPT_NONE=ON \
     -DENABLE_MAC_NONE=ON -DCRYPTO_BACKEND=OpenSSL',
                shell=True, env=os.environ)

Diff for: ci/appveyor/build_package.bat

@@ -0,0 +1,17 @@
+IF NOT "%APPVEYOR_REPO_TAG%" == "true" (exit 0)
+
+dir ssh2/
+
+for %%I in (%PYTHONVERS%) do %%I\python.exe -V
+for %%I in (%PYTHONVERS%) do %%I\python.exe setup.py build_ext
+for %%I in (%PYTHONVERS%) do %%I\python.exe setup.py build
+for %%I in (%PYTHONVERS%) do %%I\python.exe setup.py install
+
+dir ssh2/
+
+cd dist
+for %%I in (%PYTHONVERS%) do %%I\python.exe -c "from ssh2.session import Session; Session()"
+cd ..
+
+for %%I in (%PYTHONVERS%) do %%I\python.exe setup.py bdist_wheel
+mv dist/* .

Diff for: ci/appveyor/build_ssh2.bat

@@ -2,7 +2,7 @@ mkdir build_dir
 cd build_dir
 
 ECHO "Building with platform %MSVC%"
-cmake ..\libssh2\libssh2 -G "NMake Makefiles" ^
+cmake ..\libssh2 -G "NMake Makefiles" ^
        -DCMAKE_BUILD_TYPE=Release             ^
        -DCRYPTO_BACKEND=OpenSSL               ^
        -G"%MSVC%"                             ^
@@ -16,8 +16,8 @@ cmake ..\libssh2\libssh2 -G "NMake Makefiles" ^
        -DOPENSSL_ROOT_DIR=%OPENSSL_DIR%
 )
 
-cp %OPENSSL_DIR%\lib\VC\libcrypto%PYTHON_ARCH%MD.lib %APPVEYOR_BUILD_FOLDER%
-cp %OPENSSL_DIR%\lib\VC\libssl%PYTHON_ARCH%MD.lib %APPVEYOR_BUILD_FOLDER%
+cp %OPENSSL_DIR%\lib\VC\x64\MD\libcrypto.lib %APPVEYOR_BUILD_FOLDER%
+cp %OPENSSL_DIR%\lib\VC\x64\MD\libssl.lib %APPVEYOR_BUILD_FOLDER%
 
 cmake --build . --config Release
 cd ..

Diff for: ci/build-wheels.sh

@@ -17,7 +17,7 @@
 
 # Compile wheels
 # For testing
-# for PYBIN in `ls -1d /opt/python/cp36-cp36m/bin | grep -v cpython`; do
+# for PYBIN in `ls -1d /opt/python/cp310-cp310/bin | grep -v cpython`; do
 for PYBIN in $(ls -1d /opt/python/*/bin | grep -v cpython); do
     "${PYBIN}/pip" wheel /io/ -w wheelhouse/
 done
@@ -29,6 +29,8 @@ done
 
 # Install packages and test
 for PYBIN in $(ls -1d /opt/python/*/bin | grep -v cpython); do
+# for PYBIN in `ls -1d /opt/python/cp310-cp310/bin | grep -v cpython`; do
   "${PYBIN}/pip" install ssh2-python --no-index -f /io/wheelhouse
-  (cd "$HOME"; "${PYBIN}/python" -c 'from ssh2.session import Session; Session()')
+  (cd "$HOME"; "${PYBIN}/python" -c 'from ssh2.session import Session; Session()' &&
+  echo "Import sanity check succeeded.")
 done

Diff for: ci/docker/manylinux/Dockerfile

@@ -15,11 +15,11 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 FROM quay.io/pypa/manylinux2010_x86_64
 
-ENV OPENSSL openssl-1.1.1q
+ENV OPENSSL openssl-3.4.0
 ENV SYSTEM_LIBSSH2 1
-ENV LIBSSH2_VERSION 1.10.0
+ENV LIBSSH2_VERSION 1.11.1
 
-RUN yum install zlib-devel -y
+RUN yum install zlib-devel perl-IPC-Cmd -y
 
 ADD libssh2-${LIBSSH2_VERSION}.tar.gz libssh2-${LIBSSH2_VERSION}.tar.gz
 ADD https://www.openssl.org/source/${OPENSSL}.tar.gz ${OPENSSL}.tar.gz

Diff for: ci/docker/manylinux/Dockerfile.2014_x86_64

@@ -15,11 +15,11 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 FROM quay.io/pypa/manylinux2014_x86_64
 
-ENV OPENSSL openssl-1.1.1q
+ENV OPENSSL openssl-3.4.0
 ENV SYSTEM_LIBSSH2 1
-ENV LIBSSH2_VERSION 1.10.0
+ENV LIBSSH2_VERSION 1.11.1
 
-RUN yum install zlib-devel -y
+RUN yum install zlib-devel perl-IPC-Cmd -y
 
 ADD libssh2-${LIBSSH2_VERSION}.tar.gz libssh2-${LIBSSH2_VERSION}.tar.gz
 ADD https://www.openssl.org/source/${OPENSSL}.tar.gz ${OPENSSL}.tar.gz

Diff for: ci/docker/manylinux/Dockerfile.aarch64

@@ -15,9 +15,9 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 FROM quay.io/pypa/manylinux2014_aarch64
 
-ENV OPENSSL openssl-1.1.1q
+ENV OPENSSL openssl-3.4.0
 ENV SYSTEM_LIBSSH2 1
-ENV LIBSSH2_VERSION 1.10.0
+ENV LIBSSH2_VERSION 1.11.1
 
 RUN yum install zlib-devel -y
 

Diff for: ci/docker/manylinux/libssh2-1.10.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d9ec76cbe34db98eec3539fe2c899d26b0c837cb3eb466a56b0f109cabf658f7
+size 1093012