Skip to content

Commit ea98dbb

Browse files
committed
CI: clean up travis
- address warnings and deprecations - move to 3.8-dev - upgrade mypy so typed-ast doesn't break on 3.8 - remove OSX builds, no need in a pure-python package.
1 parent 58b82ab commit ea98dbb

File tree

2 files changed

+5
-48
lines changed

2 files changed

+5
-48
lines changed

.travis.yml

Lines changed: 4 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@ if: > # Forbid running non-PR pushes from pyup bot
44
not (type != pull_request AND branch =~ ^pyup\-scheduled\-update\-)
55
66
dist: xenial
7-
sudo: required
87

98
language: python
109

1110
python:
1211
- 3.5
1312
- 3.6
1413
- &mainstream_python 3.7
15-
- nightly
14+
- 3.8-dev
1615
- &pypy3 pypy3.5-6.0.0
1716

1817
install:
@@ -51,33 +50,13 @@ _helpers:
5150
apt:
5251
packages:
5352
- libenchant-dev
54-
- &osx_python_base
55-
stage: &stage_test_osx_name test under OS X (last chance to fail before deploy available)
56-
os: osx
57-
language: generic
58-
python: *pypy3
59-
env:
60-
- &env_pypy3 PYTHON_VERSION=pypy3.6-7.1.1
61-
- &env_pyenv PYENV_ROOT="$HOME/.pyenv"
62-
- &env_path PATH="$PYENV_ROOT/bin:$PATH"
63-
before_install:
64-
- brew update
65-
- brew install pyenv || brew upgrade pyenv
66-
- &ensure_pyenv_preloaded |
67-
eval "$(pyenv init -)"
68-
eval "$(pyenv virtualenv-init -)"
69-
- &install_python pyenv install --skip-existing --keep --verbose "$PYTHON_VERSION"
70-
- &switch_python pyenv shell "$PYTHON_VERSION"
71-
- &python_version python --version
72-
before_cache:
73-
- brew --cache
7453

7554
os: linux
7655

77-
jobs:
56+
matrix:
7857
fast_finish: true
7958
allow_failures:
80-
- python: nightly
59+
- python: 3.8-dev
8160

8261
- <<: *_doc_base
8362
name: Checking docs spelling
@@ -120,37 +99,15 @@ jobs:
12099

121100
- <<: *_lint_base
122101
name: Making sure that CONTRIBUTORS.txt remains sorted
123-
language: minimal
102+
language: shell
124103
install:
125104
- skip
126105
script:
127106
- LC_ALL=C sort -c CONTRIBUTORS.txt
128107

129-
- <<: *osx_python_base
130-
python: 3.5.3
131-
env:
132-
- &env_py35 PYTHON_VERSION=3.5.3
133-
- *env_pyenv
134-
- *env_path
135-
- <<: *osx_python_base
136-
python: *mainstream_python
137-
env:
138-
- *env_py36
139-
- *env_pyenv
140-
- *env_path
141-
- <<: *osx_python_base
142-
python: 3.7
143-
env:
144-
- &env_py37 PYTHON_VERSION=3.7.0
145-
- *env_pyenv
146-
- *env_path
147-
# pypy3.5-5.10.0 fails under OS X because it's unsupported
148-
149108
stages:
150109
- *doc_stage_name
151110
- test
152-
- name: *stage_test_osx_name
153-
if: type IN (api, cron)
154111

155112
cache: pip
156113

requirements/ci.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
setuptools-git==1.2
2-
mypy==0.670; implementation_name=="cpython"
2+
mypy==0.720; implementation_name=="cpython"
33
mypy-extensions==0.4.1; implementation_name=="cpython"
44

55
-r ci-wheel.txt

0 commit comments

Comments
 (0)