Skip to content

Commit 93cf4d7

Browse files
author
Pan
committed
Updated setup.py, build packages script, manifest and travis cfg.
1 parent 264e60f commit 93cf4d7

File tree

4 files changed

+20
-6
lines changed

4 files changed

+20
-6
lines changed

.travis.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ language: python
22
cache: pip
33
notifications:
44
email: false
5-
sudo: true
5+
sudo: required
66
services:
77
- docker
88
python:
@@ -32,10 +32,6 @@ jobs:
3232
- docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
3333
script:
3434
- ./docker/build-packages.sh
35-
- sudo chown -R ${USER} *
36-
- ls -ltrh *.{rpm,deb}
37-
- for x in *.rpm; do echo "Package: $x"; rpm -qlp $x; done
38-
- for x in *.deb; do echo "Package: $x"; dpkg-deb -c $x; done
3935
deploy:
4036
- provider: pypi
4137
skip_cleanup: true

MANIFEST.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
recursive-exclude embedded_server *
2+
recursive-exclude docker *
23
include versioneer.py
34
include ssh2/_version.py
5+
exclude .travis.yml

docker/build-packages.sh

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ for x in `ls -1d docker/{fedora,centos}*`; do
1313
docker build --cache-from $docker_tag $x -t $name
1414
docker tag $name $docker_tag
1515
docker push $docker_tag
16+
sudo rm -rf build dist
1617
docker run -v "$(pwd):/src/" "$name" --rpm-dist $dist -s python -t rpm setup.py
1718
done
1819

@@ -23,5 +24,20 @@ for x in `ls -1d docker/{debian,ubuntu}*`; do
2324
docker build --cache-from $docker_tag $x -t $name
2425
docker tag $name $docker_tag
2526
docker push $docker_tag
27+
sudo rm -rf build dist
2628
docker run -v "$(pwd):/src/" "$name" --iteration $name -s python -t deb setup.py
2729
done
30+
31+
sudo chown -R ${USER} *
32+
33+
ls -ltrh *.{rpm,deb}
34+
35+
for x in *.rpm; do
36+
echo "Package: $x"
37+
rpm -qlp $x
38+
done
39+
40+
for x in *.deb; do
41+
echo "Package: $x"
42+
dpkg-deb -c $x
43+
done

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
description=('Super fast SSH library - bindings for libssh2'),
6565
long_description=open('README.rst').read(),
6666
packages=find_packages(
67-
'ssh2', exclude=('embedded_server', 'embedded_server.*')),
67+
'.', exclude=('embedded_server', 'embedded_server.*')),
6868
zip_safe=False,
6969
include_package_data=True,
7070
platforms='any',

0 commit comments

Comments
 (0)