Manylinux 2010 rm (#214)

* Removed manylinux 2010. Updated build script to use embedded libssh2 for docker builds. Removed libssh2 lfs archives.
* Updated build script, dockerfiles, appveyor cfg
* Updated dockerfiles
* Updated CI cfgs
* Updated docs configuration
* Added zlib
* Updated changelog

Author: pkittenis

.appveyor.yml

@@ -19,6 +19,7 @@ build:
   verbosity: minimal
 skip_branch_with_pr: true
 image: Visual Studio 2019
+clone_script: echo Skip AppVeyor Clone
 
 environment:
   global:
@@ -32,7 +33,7 @@ environment:
     PYTHON_DEF: "C:\\Python38-x64"
     PYTHON_VERSION: "3.8"
     # Python versions to build wheels for
-    PYTHONVERS: C:\Python38-x64 C:\Python39-x64 C:\Python310-x64 C:\Python311-x64 C:\Python312-x64
+    PYTHONVERS: C:\Python37-x64 C:\Python38-x64 C:\Python39-x64 C:\Python310-x64 C:\Python311-x64 C:\Python312-x64 C:\Python313-x64
     PYTHON_ARCH: "64"
     MSVC: "Visual Studio 16 2019"
 
@@ -46,11 +47,21 @@ 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." }
+
+  # Git checkout
+  - git config --global filter.lfs.smudge "git-lfs smudge --skip -- %f"
+  - git config --global filter.lfs.process "git-lfs filter-process --skip"
+  - git init %APPVEYOR_BUILD_FOLDER%
+  - cd %APPVEYOR_BUILD_FOLDER%
+  - git remote add origin https://github.com/%APPVEYOR_REPO_NAME%.git
+  - git fetch -q origin %APPVEYOR_REPO_COMMIT%
+  - git fetch --tags
+  - git checkout -qf %APPVEYOR_REPO_COMMIT%
+
   - set OPENSSL_DIR="C:\OpenSSL-v34-Win64"
   - set VCLIBDIR=%WINDIR%\System32
-  - cp %VCLIBDIR%/vcruntime*.dll ssh2/
-  - cp %VCLIBDIR%/msvcp*.dll ssh2/
-  - cp %VCLIBDIR%/msvcr*.dll ssh2/
+  - cp %VCLIBDIR%/vcruntime140.dll ssh2/
+  - cp %VCLIBDIR%/msvcr120.dll ssh2/
   - cp %OPENSSL_DIR%/bin/*.dll ssh2/
   - ps: ls ssh2/*.dll
 
@@ -63,7 +74,6 @@ install:
   # do not cause a version change.
   - "%PYTHON_DEF%\\python.exe ci/appveyor/fix_version.py ."
   - mv -f .git .git.bak
-  - 7z x ci\appveyor\zlib1211.zip
 
 build_script:
   - dir %OPENSSL_DIR%\lib\VC\x64\MD\

.circleci/config.yml

@@ -43,7 +43,7 @@ jobs:
             set -x
             ls -lhtr ssh2/
             pwd
-            python -m pytest tests
+            python -m pytest --junit-xml=results.xml tests
           name: Test
       - run:
           command: |
@@ -64,6 +64,8 @@ jobs:
             make html
             cd ..
           name: Docs
+      - store_test_results:
+          path: results.xml
 
   osx:
     parameters:
@@ -79,7 +81,9 @@ jobs:
       - run:
           name: deps
           command: |
-            brew install cmake git-lfs python libssh2
+            set -x
+            export HOMEBREW_NO_INSTALL_CLEANUP=1
+            brew install cmake python libssh2
             brew link --force openssl
             brew link --force libssh2
             pip3 install twine
@@ -93,20 +97,15 @@ jobs:
       - run:
           name: Upload Wheel
           command: |
-            twine upload --skip-existing -u $PYPI_USER -p $PYPI_PASSWORD wheels/*
+            if [[ ! -z "$CIRCLE_TAG" ]]; then
+              twine upload --skip-existing -u $PYPI_USER -p $PYPI_PASSWORD wheels/*
+            fi
 
   manylinux-x86_64:
     machine:
       image: ubuntu-2004:current
     steps: &manylinux-steps
       - checkout
-      - run:
-          name: Git LFS
-          command: |
-            curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | sudo bash
-            sudo apt-get install git-lfs
-            git lfs install
-            git lfs pull
       - run:
           name: Deps
           command: |
@@ -118,6 +117,7 @@ jobs:
       - run:
           name: Build Wheels
           command: |
+            export LIBSSH2_VERSION=1.11.1
             if [[ -z "${CIRCLE_PULL_REQUEST}" ]]; then
               echo "$DOCKER_PASSWORD" | docker login -u="$DOCKER_USERNAME" --password-stdin;
             fi
@@ -130,7 +130,9 @@ jobs:
       - run:
           name: Upload Wheels
           command: |
-            twine upload --skip-existing -u $PYPI_USER -p $PYPI_PASSWORD dist/* wheelhouse/*
+            if [[ ! -z "$CIRCLE_TAG" ]]; then
+              twine upload --skip-existing -u $PYPI_USER -p $PYPI_PASSWORD dist/* wheelhouse/*
+            fi
 
   manylinux2014-aarch64:
     machine:

.gitattributes

@@ -7,3 +7,4 @@ zlib1211.zip 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
+*.xz filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -10,3 +10,5 @@ wheelhouse
 ssh2/libssh2.so*
 doc/_build
 venv
+ci/docker/manylinux/*.gz
+results.xml

.readthedocs.yml

@@ -1,9 +1,15 @@
 version: 2
 build:
+  os: ubuntu-24.04
+  tools:
+    python: "3"
   apt_packages:
     - cmake
     - openssl
+sphinx:
+  configuration: doc/conf.py
 python:
   install:
+    - requirements: doc/requirements.txt
     - method: pip
       path: .

Changelog.rst

@@ -1,7 +1,24 @@
 Change Log
 =============
 
-1.1.0
+1.1.2
+++++++
+
+Changes
+--------
+
+No code changes.
+
+
+Packaging
+----------
+
+* Added Windows Python 3.7 and 3.13 wheel builds.
+* Removed manylinux 2010 wheels.
+* Wheel builds now use embedded libssh and zlib.
+* Dockerfiles and scripts updates.
+
+1.1.1
 +++++
 
 Changes

_setup_libssh2.py

@@ -36,7 +36,8 @@ def build_ssh2():
     os.chdir('build_dir')
     check_call('cmake ../libssh2 -DBUILD_SHARED_LIBS=ON \
     -DENABLE_ZLIB_COMPRESSION=ON -DENABLE_CRYPT_NONE=ON \
-    -DENABLE_MAC_NONE=ON -DCRYPTO_BACKEND=OpenSSL',
+    -DENABLE_MAC_NONE=ON -DCRYPTO_BACKEND=OpenSSL \
+    -DBUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF',
                shell=True, env=os.environ)
     check_call('cmake --build . --config Release', shell=True, env=os.environ)
     os.chdir('..')

ci/appveyor/zlib1211.zip

@@ -15,8 +15,12 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
+tar -czf ci/docker/manylinux/libssh2-${LIBSSH2_VERSION}.tar.gz libssh2
+
 docker_tag="parallelssh/ssh2-manylinux"
-docker_files=("ci/docker/manylinux/Dockerfile" "ci/docker/manylinux/Dockerfile.2014_x86_64")
+docker_files=(
+    "ci/docker/manylinux/Dockerfile.2014_x86_64"
+)
 
 rm -rf build ssh2/libssh2.* ssh2/*.so
 python ci/appveyor/fix_version.py .

ci/build-manylinux.sh

@@ -15,9 +15,9 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 FROM quay.io/pypa/manylinux2014_x86_64
 
-ENV OPENSSL openssl-3.4.0
-ENV SYSTEM_LIBSSH2 1
-ENV LIBSSH2_VERSION 1.11.1
+ENV OPENSSL=openssl-3.4.0
+ENV SYSTEM_LIBSSH2=1
+ENV LIBSSH2_VERSION=1.11.1
 
 RUN yum install zlib-devel perl-IPC-Cmd -y
 
@@ -32,9 +32,10 @@ RUN cd ${OPENSSL} && \
 
 # Libssh2
 RUN mkdir -p build_libssh2 && cd build_libssh2 && \
-    cmake ../libssh2-${LIBSSH2_VERSION}.tar.gz/libssh2-${LIBSSH2_VERSION} \
+    cmake ../libssh2-${LIBSSH2_VERSION}.tar.gz/libssh2 \
     -DBUILD_SHARED_LIBS=ON -DENABLE_ZLIB_COMPRESSION=ON \
-    -DENABLE_CRYPT_NONE=ON -DENABLE_MAC_NONE=ON -DCMAKE_INSTALL_PREFIX=/usr && \
+    -DENABLE_CRYPT_NONE=ON -DENABLE_MAC_NONE=ON -DCMAKE_INSTALL_PREFIX=/usr \
+    -DBUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF && \
     cmake --build . --config Release --target install
 
 RUN rm -rf ${OPENSSL}* build_libssh2 libssh2.tar.gz

ci/docker/manylinux/Dockerfile

@@ -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-3.4.0
-ENV SYSTEM_LIBSSH2 1
-ENV LIBSSH2_VERSION 1.11.1
+ENV OPENSSL=openssl-3.4.0
+ENV SYSTEM_LIBSSH2=1
+ENV LIBSSH2_VERSION=1.11.1
 
 RUN yum install zlib-devel perl-IPC-Cmd -y
 
@@ -32,9 +32,10 @@ RUN cd ${OPENSSL} && \
 
 # Libssh2
 RUN mkdir -p build_libssh2 && cd build_libssh2 && \
-    cmake ../libssh2-${LIBSSH2_VERSION}.tar.gz/libssh2-${LIBSSH2_VERSION} \
+    cmake ../libssh2-${LIBSSH2_VERSION}.tar.gz/libssh2 \
     -DBUILD_SHARED_LIBS=ON -DENABLE_ZLIB_COMPRESSION=ON \
-    -DENABLE_CRYPT_NONE=ON -DENABLE_MAC_NONE=ON -DCMAKE_INSTALL_PREFIX=/usr && \
+    -DENABLE_CRYPT_NONE=ON -DENABLE_MAC_NONE=ON -DCMAKE_INSTALL_PREFIX=/usr \
+    -DBUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF && \
     cmake --build . --config Release --target install
 
 RUN rm -rf ${OPENSSL}* build_libssh2 libssh2.tar.gz

ci/docker/manylinux/Dockerfile.2014_x86_64

@@ -0,0 +1,2 @@
+sphinx
+sphinx_rtd_theme

ci/docker/manylinux/Dockerfile.aarch64

@@ -1,7 +1,6 @@
 cython
 flake8
 jinja2
-sphinx
-sphinx_rtd_theme
 pytest
 pytest-rerunfailures
+-r doc/requirements.txt