diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index c6321616124..bd7cfe4d627 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -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: @@ -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: @@ -171,6 +182,7 @@ jobs: ######################################################################################## - job: displayName: 'Windows' + condition: false pool: vmImage: 'vs2017-win2016' diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index d5aa1ec12a7..00000000000 --- a/.travis.yml +++ /dev/null @@ -1,99 +0,0 @@ -# Configuration file for TravisCI - -# We use miniconda for Python so don't need any Python specific tools -language: generic - -os: linux -dist: bionic - -# Only build pushes to the master branch and tags. This avoids the double -# builds than happen when working on a branch instead of a fork. -branches: - only: - - master - # Regex to build tagged commits with version numbers - - /\d+\.\d+(\.\d+)?(\S*)?$/ - -# Define environment variables common to all builds -env: - global: - # Encrypted variables - # Github Token for pushing the built docs (GH_TOKEN) - - secure: "QII0477v0mmCCW3qSNXLCOtqraJaCICtSghiyrxYsuUdJTrXzXBNhX2KLIjcKYXOK1HdwYOFGf8xBVLl44clHlAW7R32ecEGeTJizr0yqTBvT3rNG1Xb7+E6jdXqrIs//PmPRaF8zOZxPl1SJKDK4jJpCx5HnAflg7wl/6tQLD6K3/dQ6FG2s3UKsc8o4qchOiEfxYhOuKo3jt2S0HdsNAQFw3mFHCCrclxDr3llSQtWSY0mirZnta7AI4nMvzxl2nUhdHEpxgzIjWxCWLAwmj3/NxLz0VSgNCtl2bNYk6AYrc5RcANGk2fcYaZr9mTU3Aax60S4389B39Pq95hBN21jYdbw9vCN810dYpTUk2siLysx8gF6r2JWEF8SskXlF79r3phtaFTMOS4GqeiuwjifZeaLAL/H1PTQFDDG/UKEwBpLuzrPMDw/84iRtyWKqWR/f14YdKhH4YAkcOuRglEXiI/1A0qWKiZ1iZfky8Tys+wN5nyss23w/JeYXVgBdTkNzvp3diFWK8+Wl9j3HYpX9LlEHJwASA1wHLL85t4ToymgLjo9gvLvwzB7T+fWNtEbh4ELbvI7jaKrvir8uSGYy4bGbfRclh5CktD//mTLhDyAsQDS8obF/Ri9mVqFzjK6417ORfu8qnpXU+mIHPRBoKvpS2WqnPtSwF8KPv8=" - # TWINE_PASSWORD to deploy to PyPI - - secure: "md4fgPt9RC/sCoN5//5PcNHLUd9gWQGewV5hFpWW88MRTjxTng1Zfs8r7SqlF2AkEEepFfyzq0BEe9c3FMAnFbec3KmqdlQen4V8xDbLrcTlvkPlTrYGbAScUvdhhqojB//hMHoTD4KvxAv9CiUwFBO4hCMmj2buWHUbV9Ksu5WCW9mF/gkt/hIuYAU6Mbwt8PiYyMgUpzMHO1vruofcWRaVnvKwmBqHB0ae86D4/drpwn4CWjlM12WUnphT2bssiyPkw24FZtCN6kPVta6bLZKBxu0bZpw2vbXuUG+Yh19Q4mp8wNYT3XSHJf8Hl5LfujF48+cLWu+6rlCkdcelyVylhWLFc3rGOONAv4G8jWW2yNSz/bLQfJnMpd81fQEu5eySmFxB7mdB0uyKpvIG1jMJQ73LlYKakKLAPdYhMFyQAHoX9gvCE3S4QR95DBMi5gM/pZubOCcMLdjPHB5JKpJHSjxbOzyVwgmsUIEgd5Bi2vZvvYQXn1plk4xpQ3PhXc+/gi33bzY89mKcfOn0HJ2pD1vLqDXRCBsMCakoLZ0JB/6bacaz4FngbsGWuQ+I1cz20lJGL/MSi9bW1G7Uoidt3GXXWDmXrWt70vIXlLIxr8XV0Mu/rPbauGgWE+ZSYEfvdM5sP+FNF7vQ5de+Fkvzg5Z3tTfR+O1W+d7+vM4=" - - TWINE_USERNAME=Leonardo.Uieda - # The file with the listed requirements to be installed by conda - - CONDA_REQUIREMENTS=requirements.txt - - CONDA_REQUIREMENTS_DEV=requirements-dev.txt - - CONDA_INSTALL_EXTRA="codecov twine gmt=6.0.0" - # These variables control which actions are performed in a build - - DEPLOY=false - -jobs: - # Build under the following configurations - include: - - name: "Linux - Python 3.8" - os: linux - env: - - PYTHON=3.8 - - name: "Linux - Python 3.7" - os: linux - env: - - PYTHON=3.7 - - name: "Linux - Python 3.6 (deploy)" - os: linux - env: - - PYTHON=3.6 - - DEPLOY=true - -before_install: - # Get the Fatiando CI scripts - - git clone --branch=1.2.0 --depth=1 https://github.com/fatiando/continuous-integration.git - # Download and install miniconda and setup dependencies - # Need to source the script to set the PATH variable globaly - - source continuous-integration/travis/setup-miniconda.sh - # Show installed pkg information for postmortem diagnostic - - conda list - -install: - # Package and install - - python setup.py bdist_wheel - - pip install dist/* - -script: - # Run the test suite. Make pytest report any captured output on stdout or stderr. - - make test PYTEST_EXTRA="-r P" - # Build the documentation - - make -C doc all - -# Things to do if the build is successful -after_success: - # Upload coverage information - - coverage xml - - codecov -e PYTHON - -deploy: - # Make a release on PyPI - - provider: script - script: continuous-integration/travis/deploy-pypi.sh - on: - tags: true - condition: '$DEPLOY == "true"' - # Push the built HTML in doc/_build/html to the gh-pages branch - - provider: script - script: continuous-integration/travis/deploy-gh-pages.sh - skip_cleanup: true - on: - branch: master - condition: '$DEPLOY == "true"' - # Push HTML when building tags as well - - provider: script - script: continuous-integration/travis/deploy-gh-pages.sh - skip_cleanup: true - on: - tags: true - condition: '$DEPLOY == "true"' - -notifications: - email: false diff --git a/pygmt/tests/test_datasets.py b/pygmt/tests/test_datasets.py index c233ec79bf3..7c41e357872 100644 --- a/pygmt/tests/test_datasets.py +++ b/pygmt/tests/test_datasets.py @@ -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):