Skip to content

Commit 5cdc87f

Browse files
enkoreenkore
authored
Merge pull request #1 from parallel-ssh/next
ssh-python next
2 parents a62aaf2 + c3f0d7b commit 5cdc87f

File tree

174 files changed

+3323
-1889
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

174 files changed

+3323
-1889
lines changed

‎.appveyor.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ environment:
3232
PYTHON_DEF: "C:\\Python38-x64"
3333
PYTHON_VERSION: "3.8"
3434
# Python versions to build wheels for
35-
PYTHONVERS: C:\Python36-x64 C:\Python37-x64 C:\Python38-x64 C:\Python39-x64 C:\Python310-x64 C:\Python311-x64
35+
PYTHONVERS: C:\Python37-x64 C:\Python38-x64 C:\Python39-x64 C:\Python310-x64 C:\Python311-x64
3636
PYTHON_ARCH: "64"
3737

3838
install:
@@ -45,11 +45,10 @@ install:
4545
https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | `
4646
Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { `
4747
throw "There are newer queued builds for this pull request, failing early." }
48-
- set OPENSSL_DIR="C:\OpenSSL-v11-Win%PYTHON_ARCH%"
48+
- set OPENSSL_DIR="C:\OpenSSL-v30-Win%PYTHON_ARCH%"
4949
- set VCLIBDIR=%WINDIR%\System32
5050
- cp %VCLIBDIR%/vcruntime140.dll ssh/
51-
- cp %VCLIBDIR%/msvcr120.dll ssh/
52-
- cp %OPENSSL_DIR%/bin/*.dll ssh/
51+
- cp %OPENSSL_DIR%/bin/libcrypto*.dll ssh/
5352

5453
- for %%I in (%PYTHONVERS%) do %%I\python.exe -V
5554
- for %%I in (%PYTHONVERS%) do %%I\Scripts\pip install -U wheel setuptools twine cython

‎.circleci/config.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,7 @@ workflows:
141141
matrix:
142142
parameters:
143143
python_ver:
144-
- "3.6"
145-
- "3.8"
144+
- "3.7"
146145
- "3.9"
147146
- "3.11"
148147
filters:

‎ci/appveyor/fix_version.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from datetime import datetime
33
import subprocess
44
import json
5+
import re
56
import sys
67

78
def get_describe_tag():
@@ -12,11 +13,12 @@ def make_version_file(basedir):
1213
subprocess.check_output(['git', 'rev-list', '--max-count=1', 'HEAD']).strip().decode('utf-8'))
1314
basedir = os.path.abspath(basedir)
1415
git_desc = get_describe_tag()
16+
pep440ish = re.sub('^([0-9.]+)-(\\d+)-([0-9a-fg]+)', '\\1.dev\\2+\\3', git_desc)
1517
version_json = {'date': datetime.now().isoformat(),
1618
'dirty': False,
1719
'error': None,
1820
'full-revisionid': rev,
19-
'version': git_desc}
21+
'version': pep440ish}
2022
data = """
2123
import json
2224

‎ci/build-manylinux.sh‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,8 @@
1515
# License along with this library; if not, write to the Free Software
1616
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1717

18-
1918
docker_repo="parallelssh/ssh-manylinux"
2019
docker_files=(
21-
"ci/docker/manylinux/Dockerfile"
2220
"ci/docker/manylinux/Dockerfile.2014_x86_64"
2321
# "ci/docker/manylinux/Dockerfile.manylinux_2_24_x86_64"
2422
# "ci/docker/manylinux/Dockerfile.manylinux_2_28_x86_64"
@@ -36,10 +34,8 @@ if [[ $(uname -m) == "aarch64" ]]; then
3634
fi
3735

3836
for docker_file in "${docker_files[@]}"; do
39-
if [[ ${docker_file} == "ci/docker/manylinux/Dockerfile_2014_x86_64" ]]; then
37+
if [[ ${docker_file} == "ci/docker/manylinux/Dockerfile.2014_x86_64" ]]; then
4038
docker_tag="${docker_repo}:2014_x86_64"
41-
elif [[ ${docker_file} == "ci/docker/manylinux/Dockerfile" ]]; then
42-
docker_tag="${docker_repo}:2010_x86_64"
4339
elif [[ ${docker_file} == "ci/docker/manylinux/Dockerfile.manylinux_2_24_x86_64" ]]; then
4440
docker_tag="${docker_repo}:2_24_x86_64"
4541
elif [[ ${docker_file} == "ci/docker/manylinux/Dockerfile.manylinux_2_28_x86_64" ]]; then

‎ci/build-wheels.sh‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,12 @@
1717

1818
# Compile wheels
1919
rm -rf /io/build
20-
# For testing
21-
#for PYBIN in $(ls -1d /opt/python/cp310-cp310/bin | grep -v cpython); do
22-
for PYBIN in $(ls -1d /opt/python/*/bin | grep -v cpython); do
20+
21+
PYVERS=$(ls -1d /opt/python/*/bin | grep -v cpython | grep -v cp36- | sort -V)
22+
# For testing:
23+
#PYVERS=/opt/python/cp311-cp311/bin
24+
25+
for PYBIN in $PYVERS; do
2326
"${PYBIN}/pip" wheel /io/ -w wheelhouse/
2427
done
2528

@@ -29,8 +32,7 @@ for whl in wheelhouse/*.whl; do
2932
done
3033

3134
# Install packages and test
32-
#for PYBIN in $(ls -1d /opt/python/cp310-cp310/bin | grep -v cpython); do
33-
for PYBIN in $(ls -1d /opt/python/*/bin | grep -v cpython); do
35+
for PYBIN in $PYVERS; do
3436
"${PYBIN}/pip" install ssh-python --no-index -f /io/wheelhouse
3537
(cd "$HOME"; "${PYBIN}/python" -c 'from ssh.session import Session; Session()')
3638
done

‎ci/docker/manylinux/Dockerfile‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎ci/docker/manylinux/Dockerfile.2014_x86_64‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
FROM quay.io/pypa/manylinux2014_x86_64
22

3-
ENV OPENSSL openssl-1.1.1q
4-
ENV LIBSSH 0.10.4
5-
ENV KRB 1.18.4
3+
ENV OPENSSL openssl-3.1.1
4+
ENV LIBSSH 0.10.5
5+
ENV KRB 1.21.1
66
ENV SYSTEM_LIBSSH 1
77
ENV CFLAGS "-g0 -s"
88

9-
RUN yum install zlib-devel cmake3 -y
9+
RUN yum install -y zlib-devel cmake3 perl-core
1010

1111
ADD libssh-${LIBSSH}.tar.xz libssh.tar.xz
1212
ADD https://www.openssl.org/source/${OPENSSL}.tar.gz ${OPENSSL}.tar.gz

‎ci/docker/manylinux/Dockerfile.aarch64‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
FROM quay.io/pypa/manylinux2014_aarch64
22

3-
ENV OPENSSL openssl-1.1.1q
4-
ENV LIBSSH 0.10.4
5-
ENV KRB 1.18.4
3+
ENV OPENSSL openssl-3.1.1
4+
ENV LIBSSH 0.10.5
5+
ENV KRB 1.21.1
66
ENV SYSTEM_LIBSSH 1
77
ENV CFLAGS "-g0 -s"
88

9-
RUN yum install epel-release -y && yum install zlib-devel cmake3 -y
9+
RUN yum install epel-release -y && yum install zlib-devel cmake3 perl-core -y
1010

1111
ADD libssh-${LIBSSH}.tar.xz libssh.tar.xz
1212
ADD https://www.openssl.org/source/${OPENSSL}.tar.gz ${OPENSSL}.tar.gz

‎ci/docker/manylinux/Dockerfile.aarch64_2_24‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
FROM quay.io/pypa/manylinux_2_24_aarch64
22

3-
ENV OPENSSL openssl-1.1.1q
4-
ENV LIBSSH 0.10.4
5-
ENV KRB 1.18.4
3+
ENV OPENSSL openssl-3.1.1
4+
ENV LIBSSH 0.10.5
5+
ENV KRB 1.21.1
66
ENV SYSTEM_LIBSSH 1
77
ENV CFLAGS "-g0 -s"
88
ENV OPENSSL_ROOT_DIR /usr/lib
99

10-
RUN apt-get update -y && apt-get install zlib1g-dev cmake -y
10+
RUN apt-get update -y && apt-get install zlib1g-dev cmake perl-core -y
1111

1212
ADD libssh-${LIBSSH}.tar.xz libssh.tar.xz
1313
ADD https://www.openssl.org/source/${OPENSSL}.tar.gz ${OPENSSL}.tar.gz

‎ci/docker/manylinux/Dockerfile.aarch64_2_28‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
FROM quay.io/pypa/manylinux_2_28_aarch64
22

3-
ENV OPENSSL openssl-1.1.1q
4-
ENV LIBSSH 0.10.4
5-
ENV KRB 1.18.4
3+
ENV OPENSSL openssl-3.1.1
4+
ENV LIBSSH 0.10.5
5+
ENV KRB 1.21.1
66
ENV SYSTEM_LIBSSH 1
77
ENV CFLAGS "-g0 -s"
88
ENV OPENSSL_ROOT_DIR /usr/lib
99

10-
RUN yum install zlib-devel cmake3 -y
10+
RUN yum install zlib-devel cmake3 perl-core -y
1111

1212
ADD libssh-${LIBSSH}.tar.xz libssh.tar.xz
1313
ADD https://www.openssl.org/source/${OPENSSL}.tar.gz ${OPENSSL}.tar.gz

0 commit comments

Comments
 (0)