Skip to content

Commit

Permalink
Merge pull request #160 from ClearcodeHQ/requires-io-master
Browse files Browse the repository at this point in the history
[requires.io] dependency update on master branch
  • Loading branch information
fizyk committed Jun 29, 2019
2 parents e6a825a + b76ac97 commit b938dad
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
11 changes: 5 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
dist: xenial
language: python
python:
- 2.7
- 3.4
- 3.5
- 3.6
- pypy
- 3.7
- pypy3
# blocklist branches
branches:
Expand All @@ -20,10 +19,10 @@ after_success:
jobs:
include:
- stage: xdist
python: 3.6
python: 3.7
script: py.test -n 1 --cov pytest_redis tests
- stage: linters
python: 3.6
python: 3.7
install:
- pip install -r requirements-lint.txt
- pip install .[tests]
Expand All @@ -34,7 +33,7 @@ jobs:
- pyroma .
after_success: skip
- stage: deploy
python: 3.6
python: 3.7
if: tag IS present
script: skip
deploy:
Expand Down
4 changes: 2 additions & 2 deletions requirements-test.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# test runs requirements (versions we'll be testing against) - automatically updated by requires.io
coverage==4.5.3 # pytest-cov
mirakuru==2.0.1; python_version>'3.4'
mirakuru==2.0.1
port-for==0.4
pytest==4.6.3
pytest==5.0.0
redis==3.2.1

0 comments on commit b938dad

Please sign in to comment.