Skip to content

Commit

Permalink
Update requirements. Refs #135 (#136)
Browse files Browse the repository at this point in the history
Update requirements and fix python versions.
  • Loading branch information
koenedaele committed Oct 2, 2020
1 parent 39b2070 commit 4362d2c
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 16 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ sudo: false
language: python
python:
- 2.7
- 3.4
- 3.5
- 3.6
- 3.7
- 3.8
install:
- pip install -r requirements.txt
- python setup.py develop
Expand Down
15 changes: 8 additions & 7 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
--requirement requirements.txt

# Development
pyramid-debugtoolbar==4.3
waitress==1.1.0
pyramid-debugtoolbar==4.6.1
waitress==1.4.2

# Testing
nose==1.3.7
nose-testconfig==0.10
coverage==4.4.2
WebTest==2.0.29
coverage==5.3
WebTest==2.0.35

# Linting
flake8==3.5.0
flake8==3.8.3

# Documentation
Sphinx==1.6.5
sphinxcontrib-httpdomain==1.5.0
Sphinx==1.8.5 ; python_version < '3.5'
Sphinx==3.2.2 ; python_version >= '3.5'
sphinxcontrib-httpdomain==1.7.0
7 changes: 4 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Tested and approved with these versions
pyramid==1.9.2
crabpy==0.11.0
pyramid==1.10.4
crabpy==0.12.0
# -e git+ssh://git@github.com/OnroerendErfgoed/crabpy.git@FIX_0.8.1#egg=crabpy
pycountry==19.8.18
pycountry==18.12.8 ; python_version < '3.0'
pycountry==20.7.3 ; python_version >= '3.4'
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
'Development Status :: 5 - Production/Stable',
"Programming Language :: Python",
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
"Framework :: Pyramid",
"Topic :: Internet :: WWW/HTTP",
"Intended Audience :: Developers",
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py27, py34, py35, py36, cover
envlist = py27, py36, py37, py38, cover

[testenv]
commands =
Expand All @@ -13,7 +13,7 @@ deps =

[testenv:cover]
basepython =
python2.7
python3.6
commands =
python setup.py develop
pip install -r requirements.txt
Expand Down

0 comments on commit 4362d2c

Please sign in to comment.