Skip to content

WIP: Add a separate CI job for testing GMT master branch #462

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

Closed
seisman wants to merge 4 commits into from
Closed

WIP: Add a separate CI job for testing GMT master branch #462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b894288
Add a separate CI job for testing GMT master branch
seisman May 27, 2020
1221ecf
01s and 03s are valid resolutions
seisman Jun 22, 2020
ba7d8bc
Merge branch 'master' into gmt-master
seisman Jun 28, 2020
5f70424
Merge branch 'master' into gmt-master
seisman Jun 29, 2020
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
26 changes: 19 additions & 7 deletions .azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,19 @@ jobs:

strategy:
matrix:
Python38:
#Python38:
# python.version: '3.8'
# PYTHON: '3.8'
# Python37:
# python.version: '3.7'
# PYTHON: '3.7'
# Python36:
# python.version: '3.6'
# PYTHON: '3.6'
GMTMaster:
python.version: '3.8'
PYTHON: '3.8'
Python37:
python.version: '3.7'
PYTHON: '3.7'
Python36:
python.version: '3.6'
PYTHON: '3.6'
CONDA_INSTALL_EXTRA: "codecov ghostscript"

steps:

Expand Down Expand Up @@ -116,6 +120,13 @@ jobs:
conda list
displayName: List installed packages

# Install GMT master branch
- bash: |
set -x -e
brew install gmt --HEAD
displayName: Install GMT master branch
condition: eq(variables['System.JobDisplayName'], 'Mac GMTMaster')

# Cache the ${HOME}/.gmt directory, for docs and testing
- task: Cache@2
inputs:
Expand Down Expand Up @@ -171,6 +182,7 @@ jobs:
########################################################################################
- job:
displayName: 'Windows'
condition: false

pool:
vmImage: 'vs2017-win2016'
Expand Down
99 changes: 0 additions & 99 deletions .travis.yml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion pygmt/tests/test_datasets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def test_usgs_quakes():

def test_earth_relief_fails():
"Make sure earth relief fails for invalid resolutions"
resolutions = "1m 1d bla 60d 01s 03s 001m 03".split()
resolutions = "1m 1d bla 60d 001m 03".split()
resolutions.append(60)
for resolution in resolutions:
with pytest.raises(GMTInvalidInput):
Expand Down