Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switch back to Jenkins for MacOS builds #585

Merged
merged 1 commit into from
Jul 30, 2018
Merged

Switch back to Jenkins for MacOS builds #585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ matrix:
- python: 3.8-dev
dist: xenial
sudo: required
- os: osx
language: generic
env: MACPYTHON=3.5.4
- os: osx
language: generic
env: MACPYTHON=3.6.6
- os: osx
language: generic
env: MACPYTHON=3.7.0
# - os: osx
# language: generic
# env: MACPYTHON=3.5.4
# - os: osx
# language: generic
# env: MACPYTHON=3.6.6
# - os: osx
# language: generic
# env: MACPYTHON=3.7.0

script:
- ci/travis.sh
4 changes: 2 additions & 2 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
def configs = [
[
label: 'sierra',
// pyversions: ['python3.5', 'python3.6'],
pyversions: ['python3.5'],
pyversions: ['python3.5', 'python3.6', 'python3.7'],
],
]

Expand Down Expand Up @@ -53,6 +52,7 @@ def build(pyversion, label) {
export PATH="/usr/local/bin:\${PATH}"
export PATH="/Library/Frameworks/Python.framework/Versions/3.5/bin:\${PATH}"
export PATH="/Library/Frameworks/Python.framework/Versions/3.6/bin:\${PATH}"
export PATH="/Library/Frameworks/Python.framework/Versions/3.7/bin:\${PATH}"

# Workaround for https://github.com/pypa/pip/issues/5345
# See also:
Expand Down
4 changes: 4 additions & 0 deletions test-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@ ipython # for the IPython traceback integration tests
pyOpenSSL # for the ssl tests
trustme # for the ssl tests
pytest-faulthandler

# Temporary hack to work around https://github.com/MagicStack/immutables/issues/7
# until a new version of contextvars is released
immutables == 0.6