Skip to content

Commit 45c755e

Browse files
Fix Travis CI (#585)
1 parent f14fbdd commit 45c755e

File tree

6 files changed

+15
-11
lines changed

6 files changed

+15
-11
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ matrix:
3131
dist: xenial
3232
sudo: true
3333
- python: pypy
34-
env: TOX_ENV=pypy PYPY_VERSION='2.7-5.10.0'
34+
env: TOX_ENV=pypy PYPY_VERSION='3.6-7.3.0'
3535
- python: 3.5
3636
env: TOX_ENV=coverage
3737

.travis/install.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then
5252
esac
5353
pyenv rehash
5454
python -m pip install -U --user virtualenv
55+
python -m virtualenv $PWD/.venv
5556
else
5657
# pyenv installation to get specified pypy version (Travis may only have older version(s))
5758
if [[ "${TOX_ENV}" == "pypy" ]]; then
@@ -61,10 +62,13 @@ else
6162
eval "$(pyenv init -)"
6263
pyenv install "pypy${PYPY_VERSION}"
6364
pyenv global "pypy${PYPY_VERSION}"
65+
pip install -U virtualenv
66+
pip install --upgrade pip
67+
python -m venv $PWD/.venv
68+
else
69+
python -m virtualenv $PWD/.venv
6470
fi
65-
pip install -U virtualenv
6671
fi
6772

68-
python -m virtualenv $PWD/.venv
6973
source $PWD/.venv/bin/activate
7074
pip install -U tox

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ def main():
9494
'mock>=2.0.0, <4.0.0',
9595
'pycodestyle',
9696
'pylint',
97-
'sqlalchemy',
97+
'sqlalchemy<1.4.0',
9898
'tox',
9999
'pytest>=2.8.3, <4.0.0',
100100
'pytest-cov',

test/functional/mock_box/behavior/event_behavior.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def get_long_poll_url():
7777
'chunk_size': 1,
7878
'entries': [{
7979
'type': 'realtime_server',
80-
'url': 'http://localhost:8089/subscribe?channel=cc807c9c4869ffb1c81a&stream_type=all',
80+
'url': 'http://localhost:18089/subscribe?channel=cc807c9c4869ffb1c81a&stream_type=all',
8181
'ttl': 10,
8282
'max_retries': 10,
8383
'retry_timeout': 610,

test/functional/mock_box/box.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ class Box(object):
4848
"""
4949
Fake Box. Sets up 4 webservers - one for auth, one for upload, one for events, and one for the rest of the api.
5050
"""
51-
API_PORT = 8086
52-
UPLOAD_PORT = 8087
53-
OAUTH_API_PORT = 8088
54-
EVENT_PORT = 8089
55-
OAUTH_AUTHORIZE_PORT = 8090
51+
API_PORT = 18086
52+
UPLOAD_PORT = 18087
53+
OAUTH_API_PORT = 18088
54+
EVENT_PORT = 18089
55+
OAUTH_AUTHORIZE_PORT = 18090
5656
RATE_LIMIT_THRESHOLD = 100
5757
RATE_LIMIT_REQUEST_PER_SECOND = 4
5858

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ envlist =
1919

2020
[testenv]
2121
commands =
22-
pytest {posargs} --ignore=test/functional
22+
pytest {posargs} --disable-pytest-warnings
2323
deps = -rrequirements-dev.txt
2424

2525
[testenv:rst]

0 commit comments

Comments
 (0)