Skip to content

Commit b566f44

Browse files
authored
Libssh upgrade (#97)
* Upgrade embedded libssh to 0.11.3 * Updated PyPi classifiers * Updated osx wheel script to use embedded libssh rather than brew package * Updated embedded zlib to 1.3.1 and appveyor build script
1 parent 5f3e3d7 commit b566f44

File tree

410 files changed

+22265
-14485
lines changed

Some content is hidden

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

410 files changed

+22265
-14485
lines changed

.appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ environment:
3333
PYTHON_DEF: "C:\\Python38-x64"
3434
PYTHON_VERSION: "3.8"
3535
# Python versions to build wheels for
36-
PYTHONVERS: C:\Python37-x64 C:\Python38-x64 C:\Python39-x64 C:\Python310-x64 C:\Python311-x64 C:\Python312-x64 C:\Python313-x64
36+
PYTHONVERS: C:\Python38-x64 C:\Python39-x64 C:\Python310-x64 C:\Python311-x64 C:\Python312-x64 C:\Python313-x64
3737
PYTHON_ARCH: "64"
3838

3939
install:

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,9 @@ workflows:
148148
parameters:
149149
python_ver:
150150
- "3.8"
151-
- "3.10"
152151
- "3.11"
153152
- "3.12"
153+
- "3.13"
154154
filters:
155155
tags:
156156
ignore: /.*/

ci/appveyor/build_zlib.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ IF "%PYTHON_VERSION%" == "2.7" (exit 0)
22

33
mkdir zlib_build && cd zlib_build
44

5-
cmake ..\zlib-1.2.11 ^
5+
cmake ..\zlib-1.3.1 ^
66
-A x64 ^
77
-DCMAKE_INSTALL_PREFIX="C:\zlib" ^
88
-DCMAKE_BUILD_TYPE=Release ^

ci/osx-wheel.sh

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,35 +14,46 @@
1414
# You should have received a copy of the GNU Lesser General Public
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
17-
LIBSSH_DIR="/opt/homebrew/opt/libssh/lib"
17+
SYSTEM_LIBSSH_DIR="/opt/homebrew/opt/libssh/lib"
18+
MY_LIBSSH_DIR="local/lib"
1819
LIBSSH_INCLUDE_DIR="/opt/homebrew/opt/libssh/include"
19-
export LDFLAGS="-L${LIBSSH_DIR}"
20+
set -x
21+
2022
export CPPFLAGS="-I${LIBSSH_INCLUDE_DIR}"
23+
sudo cp -a libssh/include/* ${LIBSSH_INCLUDE_DIR}/
2124

25+
set +x
2226
pip3 install -U virtualenv
2327
python3 -m virtualenv -p "$(which python3)" venv
28+
set -x
2429

25-
set +x
2630
source venv/bin/activate
27-
set -x
2831

2932
python -V
3033
pip3 install -U setuptools pip
3134
pip3 install -U delocate wheel
32-
SYSTEM_LIBSSH=1 python3 setup.py bdist_wheel
35+
unset SYSTEM_LIBSSH
36+
37+
python3 setup.py bdist_wheel
3338

34-
ls -lhtr ${LIBSSH_DIR}
39+
sudo cp -a ${MY_LIBSSH_DIR}/libssh* ${SYSTEM_LIBSSH_DIR}/
40+
ls -lhtr ${SYSTEM_LIBSSH_DIR}
3541

3642
delocate-listdeps dist/*.whl
3743
delocate-wheel -v -w wheels dist/*.whl
3844
delocate-listdeps wheels/*.whl
3945

4046
ls -l wheels/*.whl
41-
rm -f ${LIBSSH_DIR}/libssh*
47+
rm -f ${SYSTEM_LIBSSH_DIR}/libssh*
48+
rm -rf local
49+
ls -lhtr ${SYSTEM_LIBSSH_DIR}
50+
4251
pip3 install -v wheels/*.whl
52+
4353
pwd; mkdir -p temp; cd temp; pwd
4454
python3 -c "from ssh.session import Session; Session()" && echo "Import successful"
4555
cd ..; pwd
56+
4657
set +x
4758
deactivate
4859
set -x

libssh/.clang-format

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
---
2+
# https://clang.llvm.org/docs/ClangFormatStyleOptions.html
3+
BasedOnStyle: LLVM
4+
IndentWidth: 4
5+
UseTab: Never
6+
AllowShortIfStatementsOnASingleLine: false
7+
BreakBeforeBraces: Custom
8+
BraceWrapping:
9+
AfterEnum: false
10+
AfterFunction: true
11+
AfterStruct: false
12+
AfterUnion: false
13+
AfterExternBlock: false
14+
BeforeElse: false
15+
BeforeWhile: false
16+
IndentCaseLabels: false
17+
IndentCaseBlocks: false
18+
ColumnLimit: 80
19+
AlignAfterOpenBracket: Align
20+
AllowAllParametersOfDeclarationOnNextLine: false
21+
BinPackArguments: false
22+
BinPackParameters: false
23+
AllowAllArgumentsOnNextLine: false
24+
AllowShortFunctionsOnASingleLine: Empty
25+
BreakAfterReturnType: ExceptShortType
26+
AlwaysBreakAfterReturnType: AllDefinitions
27+
AlignEscapedNewlines: Left
28+
ForEachMacros: ['ssh_callbacks_iterate']

0 commit comments

Comments
 (0)