Skip to content

Commit 569dfb2

Browse files
JacobCallahanJacobCallahan
authored
Merge pull request #1 from parallel-ssh/next
ssh2-python next
2 parents 692bbbf + a85d2e9 commit 569dfb2

File tree

839 files changed

+118892
-182533
lines changed

Some content is hidden

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

839 files changed

+118892
-182533
lines changed

‎.circleci/config.yml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,30 +16,30 @@
1616
version: 2.1
1717

1818
orbs:
19-
python: circleci/python@0.3.2
19+
python: circleci/python@2.1.1
2020

2121
jobs:
2222
python_test:
2323
parameters:
2424
python_ver:
2525
type: string
26-
default: "3.6"
26+
default: "3.11"
2727
docker:
28-
- image: circleci/python:<< parameters.python_ver >>
28+
- image: cimg/python:<< parameters.python_ver >>
2929
steps:
3030
- checkout
31-
- python/load-cache:
32-
dependency-file: requirements_dev.txt
33-
key: depsv3-{{ .Branch }}.{{ arch }}-PY<< parameters.python_ver >>
31+
# - python/load-cache: # This command is unavailable in the orb
32+
# dependency-file: requirements_dev.txt
33+
# key: depsv3-{{ .Branch }}.{{ arch }}-PY<< parameters.python_ver >>
3434
- run:
3535
name: Deps
3636
command: |
3737
sudo apt-get update
3838
sudo apt-get install cmake openssh-server
3939
pip install -r requirements_dev.txt
40-
- python/save-cache:
41-
dependency-file: requirements_dev.txt
42-
key: depsv3-{{ .Branch }}.{{ arch }}-PY<< parameters.python_ver >>
40+
# - python/save-cache: # This command is unavailable in the orb
41+
# dependency-file: requirements_dev.txt
42+
# key: depsv3-{{ .Branch }}.{{ arch }}-PY<< parameters.python_ver >>
4343
- run:
4444
command: |
4545
python setup.py build_ext --inplace
@@ -93,9 +93,9 @@ jobs:
9393
image: ubuntu-2004:202201-02
9494
steps: &manylinux-steps
9595
- checkout
96-
- python/load-cache:
97-
key: manylinuxdepsv6-{{ .Branch }}.{{ arch }}
98-
dependency-file: requirements_dev.txt
96+
# - python/load-cache: # This command is unavailable in the orb
97+
# key: manylinuxdepsv6-{{ .Branch }}.{{ arch }}
98+
# dependency-file: requirements_dev.txt
9999
- run:
100100
name: Git LFS
101101
command: |
@@ -112,9 +112,9 @@ jobs:
112112
which twine
113113
which python
114114
which python3
115-
- python/save-cache:
116-
key: manylinuxdepsv6-{{ .Branch }}.{{ arch }}
117-
dependency-file: requirements_dev.txt
115+
# - python/save-cache: # This command is unavailable in the orb
116+
# key: manylinuxdepsv6-{{ .Branch }}.{{ arch }}
117+
# dependency-file: requirements_dev.txt
118118
- run:
119119
name: Build Wheels
120120
command: |
@@ -139,17 +139,17 @@ jobs:
139139
steps: *manylinux-steps
140140

141141
workflows:
142-
version: 2.1
142+
version: 2
143143
main:
144144
jobs:
145145
- python_test:
146146
matrix:
147147
parameters:
148148
python_ver:
149-
- "3.6"
150149
- "3.8"
151-
- "3.9"
152150
- "3.10"
151+
- "3.11"
152+
- "3.12"
153153
filters:
154154
tags:
155155
ignore: /.*/

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ wheelhouse
99
.idea/
1010
ssh2/libssh2.so*
1111
doc/_build
12-
venv
12+
ven*

‎_setup_libssh2.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,10 @@ def build_ssh2():
3232
os.mkdir('build_dir')
3333

3434
os.chdir('build_dir')
35-
check_call('cmake ../libssh2/libssh2 -DBUILD_SHARED_LIBS=ON \
35+
check_call('cmake ../libssh2 -DBUILD_SHARED_LIBS=ON \
3636
-DENABLE_ZLIB_COMPRESSION=ON -DENABLE_CRYPT_NONE=ON \
37-
-DENABLE_MAC_NONE=ON -DCRYPTO_BACKEND=OpenSSL',
37+
-DENABLE_MAC_NONE=ON -DCRYPTO_BACKEND=OpenSSL \
38+
-DBUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF',
3839
shell=True, env=os.environ)
3940
check_call('cmake --build . --config Release', shell=True, env=os.environ)
4041
os.chdir('..')

‎ci/appveyor/build_ssh2.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ mkdir build_dir
22
cd build_dir
33

44
ECHO "Building with platform %MSVC%"
5-
cmake ..\libssh2\libssh2 -G "NMake Makefiles" ^
5+
cmake ..\libssh2 -G "NMake Makefiles" ^
66
-DCMAKE_BUILD_TYPE=Release ^
77
-DCRYPTO_BACKEND=OpenSSL ^
88
-G"%MSVC%" ^

‎ci/appveyor/fix_version.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
import sys
66

77
def get_describe_tag():
8-
return subprocess.check_output(['git', 'describe', '--tags']).strip().decode('utf-8')
8+
ver, change, commit = subprocess.check_output(['git', 'describe', '--tags']).strip().decode('utf-8').split('-')
9+
return f'{ver}+{change}.{commit}' # PEP440 compatible
910

1011
def make_version_file(basedir):
1112
rev = os.environ.get('APPVEYOR_REPO_COMMIT',

0 commit comments

Comments
 (0)