Skip to content

Libssh upgrade#97

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

Merged
pkittenis merged 6 commits into from
Oct 5, 2025
Merged

Libssh upgrade #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e21f5a6
Upgrade embedded libssh to 0.11.3
pkittenis Oct 5, 2025
84efc01
Updated PyPi classifiers
pkittenis Oct 5, 2025
8fe58ce
Updated osx wheel script
pkittenis Oct 5, 2025
f084961
CI updates
pkittenis Oct 5, 2025
bce3754
CI updates
pkittenis Oct 5, 2025
9219bc3
Updated embedded zlib and appveyor cfg
pkittenis Oct 5, 2025
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
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .appveyor.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ environment:
PYTHON_DEF: "C:\\Python38-x64"
PYTHON_VERSION: "3.8"
# Python versions to build wheels for
PYTHONVERS: C:\Python37-x64 C:\Python38-x64 C:\Python39-x64 C:\Python310-x64 C:\Python311-x64 C:\Python312-x64 C:\Python313-x64
PYTHONVERS: C:\Python38-x64 C:\Python39-x64 C:\Python310-x64 C:\Python311-x64 C:\Python312-x64 C:\Python313-x64
PYTHON_ARCH: "64"

install:
Expand Down
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -148,9 +148,9 @@ workflows:
parameters:
python_ver:
- "3.8"
- "3.10"
- "3.11"
- "3.12"
- "3.13"
filters:
tags:
ignore: /.*/
Expand Down
2 changes: 1 addition & 1 deletion ci/appveyor/build_zlib.bat
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ IF "%PYTHON_VERSION%" == "2.7" (exit 0)

mkdir zlib_build && cd zlib_build

cmake ..\zlib-1.2.11 ^
cmake ..\zlib-1.3.1 ^
-A x64 ^
-DCMAKE_INSTALL_PREFIX="C:\zlib" ^
-DCMAKE_BUILD_TYPE=Release ^
Expand Down
25 changes: 18 additions & 7 deletions ci/osx-wheel.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,35 +14,46 @@
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
LIBSSH_DIR="/opt/homebrew/opt/libssh/lib"
SYSTEM_LIBSSH_DIR="/opt/homebrew/opt/libssh/lib"
MY_LIBSSH_DIR="local/lib"
LIBSSH_INCLUDE_DIR="/opt/homebrew/opt/libssh/include"
export LDFLAGS="-L${LIBSSH_DIR}"
set -x

export CPPFLAGS="-I${LIBSSH_INCLUDE_DIR}"
sudo cp -a libssh/include/* ${LIBSSH_INCLUDE_DIR}/

set +x
pip3 install -U virtualenv
python3 -m virtualenv -p "$(which python3)" venv
set -x

set +x
source venv/bin/activate
set -x

python -V
pip3 install -U setuptools pip
pip3 install -U delocate wheel
SYSTEM_LIBSSH=1 python3 setup.py bdist_wheel
unset SYSTEM_LIBSSH

python3 setup.py bdist_wheel

ls -lhtr ${LIBSSH_DIR}
sudo cp -a ${MY_LIBSSH_DIR}/libssh* ${SYSTEM_LIBSSH_DIR}/
ls -lhtr ${SYSTEM_LIBSSH_DIR}

delocate-listdeps dist/*.whl
delocate-wheel -v -w wheels dist/*.whl
delocate-listdeps wheels/*.whl

ls -l wheels/*.whl
rm -f ${LIBSSH_DIR}/libssh*
rm -f ${SYSTEM_LIBSSH_DIR}/libssh*
rm -rf local
ls -lhtr ${SYSTEM_LIBSSH_DIR}

pip3 install -v wheels/*.whl

pwd; mkdir -p temp; cd temp; pwd
python3 -c "from ssh.session import Session; Session()" && echo "Import successful"
cd ..; pwd

set +x
deactivate
set -x
28 changes: 28 additions & 0 deletions libssh/.clang-format
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
---
# https://clang.llvm.org/docs/ClangFormatStyleOptions.html
BasedOnStyle: LLVM
IndentWidth: 4
UseTab: Never
AllowShortIfStatementsOnASingleLine: false
BreakBeforeBraces: Custom
BraceWrapping:
AfterEnum: false
AfterFunction: true
AfterStruct: false
AfterUnion: false
AfterExternBlock: false
BeforeElse: false
BeforeWhile: false
IndentCaseLabels: false
IndentCaseBlocks: false
ColumnLimit: 80
AlignAfterOpenBracket: Align
AllowAllParametersOfDeclarationOnNextLine: false
BinPackArguments: false
BinPackParameters: false
AllowAllArgumentsOnNextLine: false
AllowShortFunctionsOnASingleLine: Empty
BreakAfterReturnType: ExceptShortType
AlwaysBreakAfterReturnType: AllDefinitions
AlignEscapedNewlines: Left
ForEachMacros: ['ssh_callbacks_iterate']
Loading