Skip to content

Commit c9e475f

Browse files
authoredJan 22, 2025
Manylinux changes (#92)
* Removed manylinux 2010 builds and files. Removed manylinux2010 from build script. * Updated manylinux build script to use embedded libssh. Removed archive files. Updated embedded build script, CI cfgs. * Updated appveyor cfg * Updated embedded libssh. * Updated CI cfgs * Updated dockerfiles * Removed zlib archive, added source. * Added krb5 source. * Updated build scripts
1 parent d90ea3e commit c9e475f

File tree

5,013 files changed

+1060064
-13126
lines changed

Some content is hidden

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

5,013 files changed

+1060064
-13126
lines changed
 

‎.appveyor.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ build:
1919
verbosity: minimal
2020
skip_branch_with_pr: true
2121
image: Visual Studio 2019
22+
clone_script: echo Skip AppVeyor Clone
2223

2324
environment:
2425
global:
@@ -32,7 +33,7 @@ environment:
3233
PYTHON_DEF: "C:\\Python38-x64"
3334
PYTHON_VERSION: "3.8"
3435
# Python versions to build wheels for
35-
PYTHONVERS: C:\Python38-x64 C:\Python39-x64 C:\Python310-x64 C:\Python311-x64 C:\Python312-x64
36+
PYTHONVERS: C:\Python37-x64 C:\Python38-x64 C:\Python39-x64 C:\Python310-x64 C:\Python311-x64 C:\Python312-x64 C:\Python313-x64
3637
PYTHON_ARCH: "64"
3738

3839
install:
@@ -45,6 +46,17 @@ install:
4546
https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | `
4647
Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { `
4748
throw "There are newer queued builds for this pull request, failing early." }
49+
50+
# Git checkout
51+
- git config --global filter.lfs.smudge "git-lfs smudge --skip -- %f"
52+
- git config --global filter.lfs.process "git-lfs filter-process --skip"
53+
- git init %APPVEYOR_BUILD_FOLDER%
54+
- cd %APPVEYOR_BUILD_FOLDER%
55+
- git remote add origin https://github.com/%APPVEYOR_REPO_NAME%.git
56+
- git fetch -q origin %APPVEYOR_REPO_COMMIT%
57+
- git fetch --tags
58+
- git checkout -qf %APPVEYOR_REPO_COMMIT%
59+
4860
- set OPENSSL_DIR="C:\OpenSSL-v34-Win64"
4961
- set VCLIBDIR=%WINDIR%\System32
5062
- cp %VCLIBDIR%/vcruntime140.dll ssh/
@@ -60,11 +72,6 @@ install:
6072
# do not cause a version change.
6173
- "%PYTHON_DEF%\\python.exe ci/appveyor/fix_version.py ."
6274
- mv -f .git .git.bak
63-
- 7z x ci\appveyor\zlib1211.zip
64-
# - appveyor DownloadFile http://web.mit.edu/kerberos/dist/kfw/4.1/kfw-4.1-amd64.msi
65-
# - msiexec /i kfw-4.1-amd64.msi /passive /qn
66-
# - ps: ls "C:\Program Files\MIT\Kerberos\"
67-
# - cp "C:\Program Files\MIT\Kerberos\*.dll" ssh/
6875
- ps: ls ssh/*.dll
6976
- ps: ls ssh
7077
- ps: ls

‎.circleci/config.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ jobs:
3636
command: |
3737
pip uninstall -y cython
3838
pip install -e .
39+
python -c 'from ssh.session import Session; Session()'
3940
eval "$(ssh-agent -s)"
4041
name: Build
4142
- run:
@@ -80,7 +81,7 @@ jobs:
8081
- run:
8182
name: deps
8283
command: |
83-
brew install cmake git-lfs krb5 python libssh
84+
brew install cmake python libssh
8485
brew link --force openssl
8586
brew link --force libssh
8687
pip3 install twine
@@ -94,20 +95,15 @@ jobs:
9495
- run:
9596
name: Upload Wheel
9697
command: |
97-
twine upload --skip-existing -u $PYPI_USER -p $PYPI_PASSWORD wheels/*
98+
if [[ ! -z "$CIRCLE_TAG" ]]; then
99+
twine upload --skip-existing -u $PYPI_USER -p $PYPI_PASSWORD wheels/*
100+
fi
98101
99102
manylinux-x86_64:
100103
machine:
101104
image: ubuntu-2004:current
102105
steps: &manylinux-steps
103106
- checkout
104-
- run:
105-
name: Git LFS
106-
command: |
107-
curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | sudo bash
108-
sudo apt-get install git-lfs
109-
git lfs install
110-
git lfs pull
111107
- run:
112108
name: Deps
113109
command: |
@@ -119,6 +115,8 @@ jobs:
119115
- run:
120116
name: Build Wheels
121117
command: |
118+
export LIBSSH=0.11.1
119+
export KRB=1.21.3
122120
if [[ -z "${CIRCLE_PR_NUMBER}" ]]; then
123121
echo "$DOCKER_PASSWORD" | docker login -u="$DOCKER_USERNAME" --password-stdin;
124122
fi
@@ -131,7 +129,9 @@ jobs:
131129
- run:
132130
name: Upload Wheels
133131
command: |
134-
twine upload --skip-existing -u $PYPI_USER -p $PYPI_PASSWORD dist/* wheelhouse/*
132+
if [[ ! -z "$CIRCLE_TAG" ]]; then
133+
twine upload --skip-existing -u $PYPI_USER -p $PYPI_PASSWORD dist/* wheelhouse/*
134+
fi
135135
136136
manylinux-aarch64:
137137
machine:

0 commit comments

Comments
 (0)