Skip to content

Commit 05b9318

Browse files
authored
Ci release (#230)
* Updated circleci cfg. * Removed obsolete CI files. * Updated requirements, setup.py.
1 parent c92a2c2 commit 05b9318

File tree

5 files changed

+19
-40
lines changed

5 files changed

+19
-40
lines changed

.circleci/config.yml

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ jobs:
5656
command: codecov
5757
name: Coverage
5858

59-
manylinux:
60-
machine:
61-
image: ubuntu-1604:201903-01
59+
release:
60+
docker:
61+
- image: circleci/python:3.8
6262
steps:
6363
- checkout
6464
- python/load-cache:
65-
key: manylinuxdepsv6-{{ .Branch }}.{{ arch }}
65+
key: releasedepsv1-{{ .Branch }}.{{ arch }}
6666
dependency-file: requirements.txt
6767
- run:
6868
name: Deps
@@ -72,21 +72,18 @@ jobs:
7272
pip install -U twine
7373
which twine
7474
- python/save-cache:
75-
key: manylinuxdepsv6-{{ .Branch }}.{{ arch }}
75+
key: releasedepsv1-{{ .Branch }}.{{ arch }}
7676
dependency-file: requirements.txt
7777
- run:
78-
name: Build Wheels
78+
name: Build Wheels/Source Dist
7979
command: |
80-
if [[ -z "${CIRCLE_PULL_REQUEST}" ]]; then
81-
echo "$DOCKER_PASSWORD" | docker login -u="$DOCKER_USERNAME" --password-stdin;
82-
fi
83-
./ci/travis/build-manylinux.sh
80+
pip wheel --no-deps . -w dist
81+
python setup.py sdist
82+
ls -lh dist
8483
- run:
8584
name: PyPi Upload
8685
command: |
87-
python setup.py sdist
88-
ls -lh dist wheelhouse
89-
twine upload --skip-existing -u $PYPI_USER -p $PYPI_PASSWORD dist/* wheelhouse/*
86+
twine upload --skip-existing -u $PYPI_USER -p $PYPI_PASSWORD dist/*
9087
9188
workflows:
9289
version: 2.1
@@ -102,9 +99,8 @@ workflows:
10299
filters:
103100
tags:
104101
ignore: /.*/
105-
- manylinux:
106-
context: Docker
107-
filters:
102+
- release:
103+
filters:
108104
tags:
109105
only: /.*/
110106
branches:

ci/travis/build-manylinux.sh

Lines changed: 0 additions & 10 deletions
This file was deleted.

ci/travis/build-wheels.sh

Lines changed: 0 additions & 7 deletions
This file was deleted.

requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
gevent>=1.1
2-
ssh2-python>=0.19.0
3-
ssh-python>=0.6.0
2+
ssh2-python>=0.22.0
3+
ssh-python>=0.7.0

setup.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
# Copyright (C) 2014-2018 Panos Kittenis.
2-
1+
# Copyright (C) 2014-2020 Panos Kittenis.
2+
#
33
# This library is free software; you can redistribute it and/or
44
# modify it under the terms of the GNU Lesser General Public
55
# License as published by the Free Software Foundation, version 2.1.
6-
6+
#
77
# This library is distributed in the hope that it will be useful,
88
# but WITHOUT ANY WARRANTY; without even the implied warranty of
99
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1010
# Lesser General Public License for more details.
11-
11+
#
1212
# You should have received a copy of the GNU Lesser General Public
1313
# License along with this library; if not, write to the Free Software
1414
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
@@ -37,7 +37,7 @@
3737
'*.tests', '*.tests.*')
3838
),
3939
install_requires=[
40-
'gevent>=1.1', 'ssh2-python>=0.19.0', 'ssh-python>=0.6.0'],
40+
'gevent>=1.1', 'ssh2-python>=0.22.0', 'ssh-python>=0.7.0'],
4141
classifiers=[
4242
'Development Status :: 5 - Production/Stable',
4343
'License :: OSI Approved :: GNU Lesser General Public License v2 (LGPLv2)',

0 commit comments

Comments
 (0)