ssh-python next

.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 C:\Python311-x64
+    PYTHONVERS: C:\Python37-x64 C:\Python38-x64 C:\Python39-x64 C:\Python310-x64 C:\Python311-x64
     PYTHON_ARCH: "64"
 
 install:
@@ -45,11 +45,10 @@ 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-v30-Win%PYTHON_ARCH%"
   - set VCLIBDIR=%WINDIR%\System32
   - cp %VCLIBDIR%/vcruntime140.dll ssh/
-  - cp %VCLIBDIR%/msvcr120.dll ssh/
-  - cp %OPENSSL_DIR%/bin/*.dll ssh/
+  - cp %OPENSSL_DIR%/bin/libcrypto*.dll ssh/
 
   - for %%I in (%PYTHONVERS%) do %%I\python.exe -V
   - for %%I in (%PYTHONVERS%) do %%I\Scripts\pip install -U wheel setuptools twine cython

.circleci/config.yml

@@ -141,8 +141,7 @@ workflows:
           matrix:
             parameters:
               python_ver:
-                - "3.6"
-                - "3.8"
+                - "3.7"
                 - "3.9"
                 - "3.11"
           filters:

ci/appveyor/fix_version.py

@@ -2,6 +2,7 @@
 from datetime import datetime
 import subprocess
 import json
+import re
 import sys
 
 def get_describe_tag():
@@ -12,11 +13,12 @@ def make_version_file(basedir):
                          subprocess.check_output(['git', 'rev-list', '--max-count=1', 'HEAD']).strip().decode('utf-8'))
     basedir = os.path.abspath(basedir)
     git_desc = get_describe_tag()
+    pep440ish = re.sub('^([0-9.]+)-(\\d+)-([0-9a-fg]+)', '\\1.dev\\2+\\3', git_desc)
     version_json = {'date': datetime.now().isoformat(),
                     'dirty': False,
                     'error': None,
                     'full-revisionid': rev,
-                    'version': git_desc}
+                    'version': pep440ish}
     data = """
 import json
 

ci/build-manylinux.sh

@@ -15,10 +15,8 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-
 docker_repo="parallelssh/ssh-manylinux"
 docker_files=(
-              "ci/docker/manylinux/Dockerfile"
               "ci/docker/manylinux/Dockerfile.2014_x86_64"
 #              "ci/docker/manylinux/Dockerfile.manylinux_2_24_x86_64"
 #              "ci/docker/manylinux/Dockerfile.manylinux_2_28_x86_64"
@@ -36,10 +34,8 @@ if [[ $(uname -m) == "aarch64" ]]; then
 fi
 
 for docker_file in "${docker_files[@]}"; do
-    if [[ ${docker_file} == "ci/docker/manylinux/Dockerfile_2014_x86_64" ]]; then
+    if [[ ${docker_file} == "ci/docker/manylinux/Dockerfile.2014_x86_64" ]]; then
         docker_tag="${docker_repo}:2014_x86_64"
-    elif [[ ${docker_file} == "ci/docker/manylinux/Dockerfile" ]]; then
-        docker_tag="${docker_repo}:2010_x86_64"
     elif [[ ${docker_file} == "ci/docker/manylinux/Dockerfile.manylinux_2_24_x86_64" ]]; then
         docker_tag="${docker_repo}:2_24_x86_64"
     elif [[ ${docker_file} == "ci/docker/manylinux/Dockerfile.manylinux_2_28_x86_64" ]]; then

ci/build-wheels.sh

@@ -17,9 +17,12 @@
 
 # Compile wheels
 rm -rf /io/build
-# For testing
-#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
+
+PYVERS=$(ls -1d /opt/python/*/bin | grep -v cpython | grep -v cp36- | sort -V)
+# For testing:
+#PYVERS=/opt/python/cp311-cp311/bin
+
+for PYBIN in $PYVERS; do
     "${PYBIN}/pip" wheel /io/ -w wheelhouse/
 done
 
@@ -29,8 +32,7 @@ for whl in wheelhouse/*.whl; do
 done
 
 # Install packages and test
-#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
+for PYBIN in $PYVERS; do
     "${PYBIN}/pip" install ssh-python --no-index -f /io/wheelhouse
     (cd "$HOME"; "${PYBIN}/python" -c 'from ssh.session import Session; Session()')
 done

ci/docker/manylinux/Dockerfile.2014_x86_64

@@ -1,12 +1,12 @@
 FROM quay.io/pypa/manylinux2014_x86_64
 
-ENV OPENSSL openssl-1.1.1q
-ENV LIBSSH 0.10.4
-ENV KRB 1.18.4
+ENV OPENSSL openssl-3.1.1
+ENV LIBSSH 0.10.5
+ENV KRB 1.21.1
 ENV SYSTEM_LIBSSH 1
 ENV CFLAGS "-g0 -s"
 
-RUN yum install zlib-devel cmake3 -y
+RUN yum install -y zlib-devel cmake3 perl-core
 
 ADD libssh-${LIBSSH}.tar.xz libssh.tar.xz
 ADD https://www.openssl.org/source/${OPENSSL}.tar.gz ${OPENSSL}.tar.gz

ci/docker/manylinux/Dockerfile.aarch64

@@ -1,12 +1,12 @@
 FROM quay.io/pypa/manylinux2014_aarch64
 
-ENV OPENSSL openssl-1.1.1q
-ENV LIBSSH 0.10.4
-ENV KRB 1.18.4
+ENV OPENSSL openssl-3.1.1
+ENV LIBSSH 0.10.5
+ENV KRB 1.21.1
 ENV SYSTEM_LIBSSH 1
 ENV CFLAGS "-g0 -s"
 
-RUN yum install epel-release -y && yum install zlib-devel cmake3 -y
+RUN yum install epel-release -y && yum install zlib-devel cmake3 perl-core -y
 
 ADD libssh-${LIBSSH}.tar.xz libssh.tar.xz
 ADD https://www.openssl.org/source/${OPENSSL}.tar.gz ${OPENSSL}.tar.gz

ci/docker/manylinux/Dockerfile.aarch64_2_24

@@ -1,13 +1,13 @@
 FROM quay.io/pypa/manylinux_2_24_aarch64
 
-ENV OPENSSL openssl-1.1.1q
-ENV LIBSSH 0.10.4
-ENV KRB 1.18.4
+ENV OPENSSL openssl-3.1.1
+ENV LIBSSH 0.10.5
+ENV KRB 1.21.1
 ENV SYSTEM_LIBSSH 1
 ENV CFLAGS "-g0 -s"
 ENV OPENSSL_ROOT_DIR /usr/lib
 
-RUN apt-get update -y && apt-get install zlib1g-dev cmake -y
+RUN apt-get update -y && apt-get install zlib1g-dev cmake perl-core -y
 
 ADD libssh-${LIBSSH}.tar.xz libssh.tar.xz
 ADD https://www.openssl.org/source/${OPENSSL}.tar.gz ${OPENSSL}.tar.gz

ci/docker/manylinux/Dockerfile.aarch64_2_28

@@ -1,13 +1,13 @@
 FROM quay.io/pypa/manylinux_2_28_aarch64
 
-ENV OPENSSL openssl-1.1.1q
-ENV LIBSSH 0.10.4
-ENV KRB 1.18.4
+ENV OPENSSL openssl-3.1.1
+ENV LIBSSH 0.10.5
+ENV KRB 1.21.1
 ENV SYSTEM_LIBSSH 1
 ENV CFLAGS "-g0 -s"
 ENV OPENSSL_ROOT_DIR /usr/lib
 
-RUN yum install zlib-devel cmake3 -y
+RUN yum install zlib-devel cmake3 perl-core -y
 
 ADD libssh-${LIBSSH}.tar.xz libssh.tar.xz
 ADD https://www.openssl.org/source/${OPENSSL}.tar.gz ${OPENSSL}.tar.gz

ci/docker/manylinux/Dockerfile.manylinux_2_24_x86_64

@@ -1,13 +1,13 @@
 FROM quay.io/pypa/manylinux_2_24_x86_64
 
-ENV OPENSSL openssl-1.1.1q
-ENV LIBSSH 0.10.4
-ENV KRB 1.18.4
+ENV OPENSSL openssl-3.1.1
+ENV LIBSSH 0.10.5
+ENV KRB 1.21.1
 ENV SYSTEM_LIBSSH 1
 ENV CFLAGS "-g0 -s"
 ENV OPENSSL_ROOT_DIR /usr/lib
 
-RUN apt-get update -y && apt-get install zlib1g-dev cmake -y
+RUN apt-get update -y && apt-get install zlib1g-dev cmake perl-core -y
 
 ADD libssh-${LIBSSH}.tar.xz libssh.tar.xz
 ADD https://www.openssl.org/source/${OPENSSL}.tar.gz ${OPENSSL}.tar.gz

ci/docker/manylinux/Dockerfile.manylinux_2_28_x86_64

@@ -1,13 +1,13 @@
 FROM quay.io/pypa/manylinux_2_28_x86_64
 
-ENV OPENSSL openssl-1.1.1q
-ENV LIBSSH 0.10.4
-ENV KRB 1.18.4
+ENV OPENSSL openssl-3.1.1
+ENV LIBSSH 0.10.5
+ENV KRB 1.21.1
 ENV SYSTEM_LIBSSH 1
 ENV CFLAGS "-g0 -s"
 ENV OPENSSL_ROOT_DIR /usr/lib
 
-RUN yum install zlib-devel cmake3 -y
+RUN yum install -y zlib-devel cmake3 perl-core
 
 ADD libssh-${LIBSSH}.tar.xz libssh.tar.xz
 ADD https://www.openssl.org/source/${OPENSSL}.tar.gz ${OPENSSL}.tar.gz

ci/docker/manylinux/libssh-0.10.5.tar.xz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEjf9T4Y8qvI2PPJIjfuD8TcwBTj0FAmRTm30ACgkQfuD8TcwB
+Tj0TBQ/+MS5qNXgV8I/3s0k6jpzTsEMdozOZ7RYiJg9i9UzCGsIuJ0aiMl+G1aFH
+UJOkLlHgGXTSCeZk4aoSTky2jEOezcFgsi0v9j8nmxRTjlDDAY0KxOoA//wc5nQ0
+fgQKUbX0SrtIbe9qpffoGBjaEap2ICAiM7a5PJ+Js0RQ944TqmkWmhGP/2XhxsF9
+0TJ6e4ilSg/mTBV5GemLTRSc+MgFoh5jJiV1+zmkOw5bBvPx7/KgsdmhoZ63prFI
+8LvfChEEx50lyTXC8eLW4uSvO5tMHyAwDNBJcKOccp5yqEr147S1pZL8iNS0C2EF
+/vG7zRDa3dv81xJjuPVdO40/GE77omp1IWC3i4ZskaAocGOmHo7KSwJ/7MjtAuJT
+QgqeTPHjENRYbB6FvyesHpWzesORFIxQtCMxugVpEPcc3WLIRNLvJGa7rofAGJJf
+u5uLyzmBuyAWm5gpPMyLRy2ysAgBi7NVusnAuR4v28r8YYpGrwTG+epJ1fV6MKWV
+tlV8aCY51H7WVmDNJlwyJOwEZWzRdi9n3e22hEm79+cj3WKY3uwYwJI4s0CgcsUw
+OzEZt97Yy+pSvdOokgNHRz0tGoDXZw55PF4+mcyvXSQfZJ2QCL7q7dJ/7DmibGgY
+LtsN5bSfzXgEBqpty/sD5HSSt1/fNICJjfuiTKtjKXMD45wBUkE=
+=IAN/
+-----END PGP SIGNATURE-----