Skip to content

Commit a0196a8

Browse files
pkittenispkittenis
authored
Circleci (#116)
* Added circleci config. Updated travis cfg
1 parent 75f8475 commit a0196a8

File tree

3 files changed

+184
-44
lines changed

3 files changed

+184
-44
lines changed

‎.circleci/config.yml

+145
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,145 @@
1+
version: 2.1
2+
3+
orbs:
4+
python: circleci/[email protected]
5+
6+
jobs:
7+
python_test:
8+
parameters:
9+
python_ver:
10+
type: string
11+
default: "3.6"
12+
docker:
13+
- image: circleci/python:<< parameters.python_ver >>
14+
steps:
15+
- checkout
16+
- python/load-cache:
17+
dependency-file: requirements_dev.txt
18+
key: depsv3-{{ .Branch }}.{{ arch }}-PY<< parameters.python_ver >>
19+
- run:
20+
name: Deps
21+
command: |
22+
sudo apt-get install cmake openssh-server
23+
pip install -r requirements_dev.txt
24+
- python/save-cache:
25+
dependency-file: requirements_dev.txt
26+
key: depsv3-{{ .Branch }}.{{ arch }}-PY<< parameters.python_ver >>
27+
- run:
28+
command: |
29+
python setup.py build_ext --inplace
30+
eval "$(ssh-agent -s)"
31+
name: Build
32+
- run:
33+
command: |
34+
ls -lhtr ssh2/
35+
pwd
36+
pytest tests
37+
flake8 ssh2
38+
python setup.py sdist
39+
cd dist; pip install *; python -c 'from ssh2.session import Session; Session()'; cd ..
40+
cd doc
41+
make html
42+
cd ..
43+
name: Test
44+
45+
osx:
46+
parameters:
47+
xcode_ver:
48+
type: string
49+
default: "11.6.0"
50+
macos:
51+
xcode: << parameters.xcode_ver >>
52+
environment:
53+
HOMEBREW_NO_AUTO_UPDATE: 1
54+
SYSTEM_LIBSSH2: 1
55+
steps:
56+
- checkout
57+
- run:
58+
name: deps
59+
command: |
60+
brew install cmake git-lfs python libssh2
61+
pip3 install twine
62+
which twine
63+
- run:
64+
name: Build Wheel
65+
command: |
66+
./ci/osx-wheel.sh
67+
- store_artifacts:
68+
path: wheels
69+
- run:
70+
name: Upload Wheel
71+
command: |
72+
twine upload --skip-existing -u $PYPI_USER -p $PYPI_PASSWORD wheels/*
73+
74+
manylinux:
75+
machine:
76+
image: ubuntu-1604:201903-01
77+
steps:
78+
- checkout
79+
- python/load-cache:
80+
key: manylinuxdepsv6-{{ .Branch }}.{{ arch }}
81+
dependency-file: requirements_dev.txt
82+
- run:
83+
name: Git LFS
84+
command: |
85+
curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | sudo bash
86+
sudo apt-get install git-lfs
87+
git lfs install
88+
git lfs pull
89+
- run:
90+
name: Deps
91+
command: |
92+
sudo apt-get install python-pip
93+
pip install -U pip
94+
pip install twine
95+
which twine
96+
- python/save-cache:
97+
key: manylinuxdepsv6-{{ .Branch }}.{{ arch }}
98+
dependency-file: requirements_dev.txt
99+
- run:
100+
name: Build Wheels
101+
command: |
102+
if [[ -z "${CIRCLE_PULL_REQUEST}" ]]; then
103+
echo "$DOCKER_PASSWORD" | docker login -u="$DOCKER_USERNAME" --password-stdin;
104+
fi
105+
./ci/travis/build-manylinux.sh
106+
- run:
107+
name: sdist
108+
command: python setup.py sdist
109+
- run:
110+
name: Upload Wheels
111+
command: |
112+
twine upload --skip-existing -u $PYPI_USER -p $PYPI_PASSWORD dist/* wheelhouse/*
113+
114+
workflows:
115+
version: 2.1
116+
main:
117+
jobs:
118+
- python_test:
119+
matrix:
120+
parameters:
121+
python_ver:
122+
- "3.6"
123+
- "3.7"
124+
- "3.8"
125+
filters:
126+
tags:
127+
ignore: /.*/
128+
- manylinux:
129+
context: Docker
130+
filters:
131+
tags:
132+
only: /.*/
133+
branches:
134+
ignore: /.*/
135+
- osx:
136+
matrix:
137+
parameters:
138+
xcode_ver:
139+
- "11.6.0"
140+
- "11.1.0"
141+
filters:
142+
tags:
143+
only: /.*/
144+
branches:
145+
ignore: /.*/

‎.travis.yml

+38-43
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ notifications:
99
email: false
1010
python:
1111
- 2.7
12-
- 3.6
13-
- 3.7
14-
- 3.8
1512
install:
1613
- pip install flake8 jinja2 sphinx sphinx_rtd_theme
1714
- python setup.py build_ext --inplace
@@ -44,46 +41,44 @@ jobs:
4441
include:
4542

4643
- stage: test
47-
if: type = push OR \
48-
(type = pull_request AND fork = true)
4944

50-
- &osx-wheels
51-
stage: build packages
52-
if: tag IS present
53-
os: osx
54-
osx_image: xcode11.6
55-
env:
56-
- SYSTEM_LIBSSH2: 1
57-
before_install:
58-
- brew install libssh2
59-
- pip3 install twine
60-
- which twine
61-
install: skip
62-
script:
63-
- ./ci/osx-wheel.sh
64-
after_success:
65-
- if [[ ! -z "$TRAVIS_TAG" ]]; then
66-
twine upload --skip-existing -u $PYPI_U -p $PYPI_P wheels/*.whl;
67-
fi
68-
language: generic
69-
python: skip
45+
# - &osx-wheels
46+
# stage: build packages
47+
# if: tag IS present
48+
# os: osx
49+
# osx_image: xcode11.6
50+
# env:
51+
# - SYSTEM_LIBSSH2: 1
52+
# before_install:
53+
# - brew install libssh2
54+
# - pip3 install twine
55+
# - which twine
56+
# install: skip
57+
# script:
58+
# - ./ci/osx-wheel.sh
59+
# after_success:
60+
# - if [[ ! -z "$TRAVIS_TAG" ]]; then
61+
# twine upload --skip-existing -u $PYPI_U -p $PYPI_P wheels/*.whl;
62+
# fi
63+
# language: generic
64+
# python: skip
7065

71-
- <<: *osx-wheels
72-
osx_image: xcode11.3
66+
# - <<: *osx-wheels
67+
# osx_image: xcode11.3
7368

74-
- stage: build packages
75-
if: tag IS present
76-
os: linux
77-
python: 3.6
78-
env:
79-
- WHEELS=1
80-
install:
81-
- pip install twine
82-
script:
83-
- python setup.py sdist
84-
- if [[ "$TRAVIS_PULL_REQUEST" == "false" ]]; then docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"; fi
85-
- ./ci/travis/build-manylinux.sh
86-
after_success:
87-
- if [[ ! -z "$TRAVIS_TAG" ]]; then
88-
twine upload --skip-existing -u $PYPI_U -p $PYPI_P wheelhouse/*.whl dist/*;
89-
fi
69+
# - stage: build packages
70+
# if: tag IS present
71+
# os: linux
72+
# python: 3.6
73+
# env:
74+
# - WHEELS=1
75+
# install:
76+
# - pip install twine
77+
# script:
78+
# - if [[ "$TRAVIS_PULL_REQUEST" == "false" ]]; then docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"; fi
79+
# - ./ci/travis/build-manylinux.sh
80+
# - python setup.py sdist
81+
# after_success:
82+
# - if [[ ! -z "$TRAVIS_TAG" ]]; then
83+
# twine upload --skip-existing -u $PYPI_U -p $PYPI_P wheelhouse/*.whl dist/*;
84+
# fi

‎ci/travis/build-manylinux.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
docker_tag="parallelssh/ssh2-manylinux"
44

5-
rm -rf build dist ssh2/libssh2.*
5+
rm -rf build ssh2/libssh2.*
66
python ci/appveyor/fix_version.py .
77

88
docker pull $docker_tag || echo

0 commit comments

Comments
 (0)