Skip to content

Commit

Permalink
Fixed CCI 3.6 test which actually ran 3.5
Browse files Browse the repository at this point in the history
  • Loading branch information
Erotemic committed Jun 26, 2021
1 parent b241915 commit 38c5243
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ jobs:
test_full/cp36-36m-linux:
<<: *test_full_template
docker:
- image: circleci/python:3.5
- image: circleci/python:3.6

test_full/cp35-35m-linux:
<<: *test_full_template
Expand Down
14 changes: 9 additions & 5 deletions requirements/tests.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
# Tested with pytest versions:
# 5.4.3
# 6.2.2

# TODO:
# Should run dashboards that test strict and loose versions of the requirements

# Pin maximum pytest versions for older python versions
# TODO: determine what the actual minimum and maximum acceptable versions of
# pytest (that are also compatible with xdoctest) are for each legacy python
# major.minor version.

pytest >= 3.3.1 ; python_version >= '3.7.0'
pytest >= 4.6.0, <= 6.2.0 ; python_version < '3.7.0' and python_version >= '3.6.0'
pytest >= 4.6.0, <= 5.0.0 ; python_version < '3.6.0' and python_version >= '3.5.0'
pytest >= 3.3.1, < 4.7.0 ; python_version < '3.5.0'
pytest >= 4.6.0 ; python_version >= '3.7.0' # Python 3.7+
pytest >= 4.6.0 ; python_version < '3.7.0' and python_version >= '3.6.0' # Python 3.6
pytest >= 4.6.0, <= 6.1.2 ; python_version < '3.6.0' and python_version >= '3.5.0' # Python 3.5
pytest >= 3.3.1, <= 4.6.11 ; python_version < '3.5.0' and python_version >= '3.4.0' # Python 3.4
pytest >= 3.3.1, <= 4.6.11 ; python_version < '2.8.0' and python_version >= '2.7.0' # Python 2.7

##
pytest-cov > 2.6.0 ; python_version >= '3.7.0'
Expand Down

0 comments on commit 38c5243

Please sign in to comment.