Skip to content

Commit 3365ab1

Browse files
committed
Update travis and supported Python versions
1 parent 1c7080e commit 3365ab1

File tree

3 files changed

+44
-26
lines changed

3 files changed

+44
-26
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ htmlcov/
1717
.tox/
1818
.coverage
1919
.coverage.*
20-
.cache
20+
.pytest_cache/
21+
.eggs/
2122
coverage.xml
2223
tests/junit.xml
2324

.travis.yml

Lines changed: 38 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,48 @@
11
language: python
22

3-
branches:
4-
except:
5-
- gh-pages
6-
7-
cache:
8-
directories:
9-
- "${HOME}/virtualenv"
10-
- "${TRAVIS_BUILD_DIR}/.tox"
11-
123
python:
13-
- 2.6
14-
- 2.7
15-
- 3.3
16-
- 3.4
17-
- 3.5
18-
- 3.6
19-
- pypy
4+
- "3.6"
5+
6+
stages:
7+
- test
8+
- name: deploy
9+
if: repo = pytest-dev/pytest-flask AND tag IS present
10+
11+
jobs:
12+
include:
13+
- env: TOXENV=py27
14+
python: '2.7'
15+
- env: TOXENV=py34
16+
python: '3.4'
17+
- env: TOXENV=py35
18+
python: '3.5'
19+
- env: TOXENV=py36
20+
python: '3.6'
21+
- env: TOXENV=py37
22+
python: '3.7'
23+
sudo: required
24+
dist: xenial
2025

21-
matrix:
22-
fast_finish: true
23-
allow_failures:
24-
- python: 3.6
25-
- python: 3.5
26+
- stage: deploy
27+
python: '3.6'
28+
env:
29+
install: pip install -U setuptools setuptools_scm
30+
script: skip
31+
deploy:
32+
provider: pypi
33+
user: nicoddemus
34+
distributions: sdist bdist_wheel
35+
skip_upload_docs: true
36+
password:
37+
secure: xanTgTUu6XDQVqB/0bwJQXoDMnU5tkwZc5koz6mBkkqZhKdNOi2CLoC1XhiSZ+ah24l4V1E0GAqY5kBBcy9d7NVe4WNg4tD095LsHw+CRU6/HCVIFfyk2IZ+FPAlguesCcUiJSXOrlBF+Wj68wEvLoK7EoRFbJeiZ/f91Ww1sbtDlqXABWGHrmhPJL5Wva7o7+wG7JwJowqdZg1pbQExsCc7b53w4v2RBu3D6TJaTAzHiVsW+nUSI67vKI/uf+cR/OixsTfy37wlHgSwihYmrYLFls3V0bSpahCim3bCgMaFZx8S8xrdgJ++PzBCof2HeflFKvW+VCkoYzGEG4NrTWJoNz6ni4red9GdvfjGH3YCjAKS56h9x58zp2E5rpsb/kVq5/45xzV+dq6JRuhQ1nJWjBC6fSKAc/bfwnuFK3EBxNLkvBssLHvsNjj5XG++cB8DdS9wVGUqjpoK4puaXUWFqy4q3S9F86HEsKNgExtieA9qNx+pCIZVs6JCXZNjr0I5eVNzqJIyggNgJG6RyravsU35t9Zd9doL5g4Y7UKmAGTn1Sz24HQ4sMQgXdm2SyD8gEK5je4tlhUvfGtDvMSlstq71kIn9nRpFnqB6MFlbYSEAZmo8dGbCquoUc++6Rum208wcVbrzzVtGlXB/Ow9AbFMYeAGA0+N/K1e59c=
38+
on:
39+
tags: true
40+
repo: pytest-dev/pytest-flask
2641

2742
install:
28-
- pip install tox
29-
- pip install tox-travis
43+
- pip install -U pip
44+
- pip install -U tox setuptools
3045

3146
script:
3247
- tox
33-
- "find ${TRAVIS_BUILD_DIR}/.tox -name log -o -name __pycache__ -type d | xargs -I {} rm -rf {}"
3448

setup.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,10 @@ def read(*parts):
166166
'Programming Language :: Python :: 2',
167167
'Programming Language :: Python :: 2.7',
168168
'Programming Language :: Python :: 3',
169-
'Programming Language :: Python :: 3.3',
169+
'Programming Language :: Python :: 3.4',
170+
'Programming Language :: Python :: 3.5',
171+
'Programming Language :: Python :: 3.6',
172+
'Programming Language :: Python :: 3.7',
170173
'Topic :: Software Development :: Testing',
171174
'Topic :: Software Development :: Libraries :: Python Modules',
172175
],

0 commit comments

Comments
 (0)