Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ssh2-python next #1

Merged
merged 8 commits into from
Mar 26, 2024
Merged

ssh2-python next #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
75176e3
Updates for ConfigParser in python 3.12
JacobCallahan Oct 3, 2023
1626d7e
Additional 3.12 compatibility changes
JacobCallahan Nov 10, 2023
440a255
re-cythonize with a constrained cython version
JacobCallahan Nov 13, 2023
07b124b
Update build to Cython 3.0.5
JacobCallahan Nov 22, 2023
abbbf86
Update the vendored libssh2
JacobCallahan Nov 22, 2023
6f88957
Merge pull request #194 'JacobCallahan-master' into next
Nov 23, 2023
6eaf69c
delete second copy of libssh2
enkore Nov 23, 2023
a85d2e9
fix libssh2 source location in appveyor build
enkore Nov 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
36 changes: 18 additions & 18 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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: |
Expand All @@ -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: |
Expand All @@ -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: /.*/
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ wheelhouse
.idea/
ssh2/libssh2.so*
doc/_build
venv
ven*
5 changes: 3 additions & 2 deletions _setup_libssh2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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('..')
Expand Down
2 changes: 1 addition & 1 deletion ci/appveyor/build_ssh2.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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%" ^
Expand Down
3 changes: 2 additions & 1 deletion ci/appveyor/fix_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Loading