Skip to content

Commit

Permalink
Merge pull request #157 from Kinto/update-travis-config
Browse files Browse the repository at this point in the history
Upgrade travis-ci config for new Kinto 11.2
  • Loading branch information
Natim committed Dec 4, 2018
2 parents 2e34a5a + 0122a5f commit 186cc00
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 16 deletions.
10 changes: 6 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: python
python: 3.5
python: 3.6
env:
- TOX_ENV=py35
- TOX_ENV=py36
- TOX_ENV=kinto-master
- TOX_ENV=flake8
install:
Expand Down Expand Up @@ -29,6 +29,8 @@ matrix:
- make install
- pip install -U https://github.com/Kinto/kinto/zipball/master
- make run-kinto &
- python: 3.6
- python: 3.7
dist: xenial
sudo: true
env:
- TOX_ENV=py36
- TOX_ENV=py37
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ install: $(INSTALL_STAMP)
$(INSTALL_STAMP): $(PYTHON) setup.py
$(VENV)/bin/pip install -U pip
$(VENV)/bin/pip install -Ur dev-requirements.txt
$(VENV)/bin/pip install -Ue .
$(VENV)/bin/pip install --pre -Ue .
touch $(INSTALL_STAMP)

virtualenv: $(PYTHON)
Expand All @@ -24,7 +24,7 @@ $(PYTHON):
build-requirements:
$(VIRTUALENV) $(TEMPDIR)
$(TEMPDIR)/bin/pip install -U pip
$(TEMPDIR)/bin/pip install -Ue .
$(TEMPDIR)/bin/pip install --pre -Ue .
$(TEMPDIR)/bin/pip freeze | grep -v -- '^-e' > requirements.txt

moto:
Expand Down
20 changes: 11 additions & 9 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,29 +1,31 @@
attrs==18.2.0
bcrypt==3.1.4
boto==2.49.0
certifi==2018.10.15
certifi==2018.11.29
cffi==1.11.5
chardet==3.0.4
colander==1.5.1
colorama==0.4.0
cornice==3.4.2
colorama==0.4.1
cornice==3.4.3
cornice-swagger==0.7.0
dockerflow==2018.4.0
hupper==1.4.1
hupper==1.4.2
idna==2.7
iso8601==0.1.12
jsonpatch==1.23
jsonpointer==2.0
jsonschema==2.6.0
kinto==11.1.0
jsonschema==3.0.0a3
kinto==11.2.0
logging-color-formatter==1.0.2
PasteDeploy==1.5.2
PasteDeploy==2.0.1
plaster==1.0
plaster-pastedeploy==0.6
pycparser==2.19
pyramid==1.10.1
pyramid-multiauth==0.9.0
pyramid-storage==0.1.2
pyramid-storage==0.2.0
pyramid-tm==2.2.1
pyrsistent==0.14.7
python-dateutil==2.7.5
requests==2.20.1
simplejson==3.16.0
Expand All @@ -35,5 +37,5 @@ urllib3==1.24.1
venusian==1.1.0
waitress==1.1.0
WebOb==1.8.4
zope.deprecation==4.3.0
zope.deprecation==4.4.0
zope.interface==4.6.0
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py35,py36,kinto-master,upload-download-scripts,flake8
envlist = py36,py37,kinto-master,upload-download-scripts,flake8
skip_missing_interpreters = True

[testenv]
Expand Down

0 comments on commit 186cc00

Please sign in to comment.