Merge pull request #1 from parallel-ssh/next

ssh2-python next
parallel-ssh · Mar 26, 2024 · 569dfb2 · 569dfb2
2 parents 692bbbf + a85d2e9
commit 569dfb2
Show file tree

Hide file tree

Showing 839 changed files with 118,892 additions and 182,533 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -16,30 +16,30 @@
 version: 2.1
 
 orbs:
-  python: circleci/python@0.3.2
+  python: circleci/python@2.1.1
 
 jobs:
   python_test:
     parameters:
       python_ver:
         type: string
-        default: "3.6"
+        default: "3.11"
     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 >>
+      # - python/load-cache:  #  This command is unavailable in the orb
+      #     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 >>
+      # - python/save-cache:  #  This command is unavailable in the orb
+      #     dependency-file: requirements_dev.txt
+      #     key: depsv3-{{ .Branch }}.{{ arch }}-PY<< parameters.python_ver >>
       - run:
           command: |
             python setup.py build_ext --inplace
@@ -93,9 +93,9 @@ jobs:
       image: ubuntu-2004:202201-02
     steps: &manylinux-steps
       - checkout
-      - python/load-cache:
-          key: manylinuxdepsv6-{{ .Branch }}.{{ arch }}
-          dependency-file: requirements_dev.txt
+      # - python/load-cache:  #  This command is unavailable in the orb
+      #     key: manylinuxdepsv6-{{ .Branch }}.{{ arch }}
+      #     dependency-file: requirements_dev.txt
       - run:
           name: Git LFS
           command: |
@@ -112,9 +112,9 @@ jobs:
             which twine
             which python
             which python3
-      - python/save-cache:
-          key: manylinuxdepsv6-{{ .Branch }}.{{ arch }}
-          dependency-file: requirements_dev.txt
+      # - python/save-cache:  #  This command is unavailable in the orb
+      #     key: manylinuxdepsv6-{{ .Branch }}.{{ arch }}
+      #     dependency-file: requirements_dev.txt
       - run:
           name: Build Wheels
           command: |
@@ -139,17 +139,17 @@ jobs:
     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: /.*/

diff --git a/.gitignore b/.gitignore
@@ -9,4 +9,4 @@ wheelhouse
 .idea/
 ssh2/libssh2.so*
 doc/_build
-venv
+ven*
diff --git a/_setup_libssh2.py b/_setup_libssh2.py
@@ -32,9 +32,10 @@ def build_ssh2():
         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',
+    -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('..')

diff --git a/ci/appveyor/build_ssh2.bat b/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%"                             ^

diff --git a/ci/appveyor/fix_version.py b/ci/appveyor/fix_version.py
@@ -5,7 +5,8 @@
 import sys
 
 def get_describe_tag():
-    return subprocess.check_output(['git', 'describe', '--tags']).strip().decode('utf-8')
+    ver, change, commit = subprocess.check_output(['git', 'describe', '--tags']).strip().decode('utf-8').split('-')
+    return f'{ver}+{change}.{commit}'  # PEP440 compatible
 
 def make_version_file(basedir):
     rev = os.environ.get('APPVEYOR_REPO_COMMIT',
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,4 +9,4 @@ wheelhouse @@
     .idea/
     ssh2/libssh2.so*
     doc/_build
-    venv
+    ven*