Skip to content

Commit 66fb4a9

Browse files
Make Travis builds work
- Work around Ubuntu not packaging flake8 - Fix requirements and setup dependencies - Drop python-2.6 support (python-gssapi doesn't work) - Call nosetests for portability - Move manipulation logic into scripts Signed-off-by: Robbie Harwood <rharwood@redhat.com>
1 parent 5ea2b02 commit 66fb4a9

File tree

5 files changed

+20
-12
lines changed

5 files changed

+20
-12
lines changed

.travis.install.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/bash -ex
2+
3+
if [ $(python -c 'import sys; print(sys.version[:3])') == '3.6' ]; then
4+
pip install flake8
5+
fi
6+
7+
pip install -r requirements.txt
8+
9+
pip install .

.travis.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/bash -ex
2+
3+
if [ ! -z $(which flake8) ]; then
4+
flake8
5+
fi
6+
7+
nosetests

.travis.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,11 @@
1-
sudo: required
2-
31
language: python
42
python:
5-
- "2.6"
63
- "2.7"
74
- "3.4"
85
- "3.6"
96

10-
before_install:
11-
- sudo apt-get update -qq
12-
- sudo apt-get install flake8
13-
147
install:
15-
- pip install .
8+
- bash -ex .travis.install.sh
169

1710
script:
18-
- flake8
19-
- py.test test_requests_gssapi.py
11+
- bash -ex .travis.sh

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
requests>=1.1.0
2-
pykerberos >= 1.1.8, < 2.0.0
2+
gssapi

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def get_version():
4949
version=get_version(),
5050
install_requires=[
5151
'requests>=1.1.0',
52-
'pykerberos>=1.1.8,<2.0.0',
52+
'gssapi',
5353
],
5454
test_suite='test_requests_gssapi',
5555
tests_require=['mock'],

0 commit comments

Comments
 (0)