diff --git a/.github/workflows/cache_data.yaml b/.github/workflows/cache_data.yaml index de68136471e..8682712faa7 100644 --- a/.github/workflows/cache_data.yaml +++ b/.github/workflows/cache_data.yaml @@ -23,7 +23,7 @@ jobs: # Install GMT - name: Install GMT shell: bash -l {0} - run: conda install -c conda-forge gmt=6.1.0 + run: conda install -c conda-forge gmt=6.1.1 # Download remote files - name: Download remote data diff --git a/.github/workflows/ci_tests.yaml b/.github/workflows/ci_tests.yaml index 9fc83adfe2f..b48bbd1b169 100644 --- a/.github/workflows/ci_tests.yaml +++ b/.github/workflows/ci_tests.yaml @@ -77,7 +77,7 @@ jobs: requirements_file=full-conda-requirements.txt cat requirements.txt requirements-dev.txt > $requirements_file cat << EOF >> $requirements_file - gmt=6.1.0 + gmt=6.1.1 make codecov EOF diff --git a/.travis.yml b/.travis.yml index 2182cf7d1ab..aa23e5e261d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,7 @@ env: # 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.1.0" + - CONDA_INSTALL_EXTRA="codecov twine gmt=6.1.1" # These variables control which actions are performed in a build - DEPLOY=false diff --git a/doc/install.rst b/doc/install.rst index d67648af71a..60f5032e8a0 100644 --- a/doc/install.rst +++ b/doc/install.rst @@ -31,7 +31,7 @@ Which GMT? PyGMT requires Generic Mapping Tools (GMT) version 6 as a minimum, which is the latest released version that can be found at the `GMT official site `__. -We need the latest GMT (>=6.1.0) since there are many changes being made to GMT itself in +We need the latest GMT (>=6.1.1) since there are many changes being made to GMT itself in response to the development of PyGMT, mainly the new `modern execution mode `__. diff --git a/environment.yml b/environment.yml index 378fc86064f..0590f52b8ca 100644 --- a/environment.yml +++ b/environment.yml @@ -5,7 +5,7 @@ channels: dependencies: - python=3.7 - pip - - gmt=6.1.0 + - gmt=6.1.1 - numpy - pandas - xarray diff --git a/package.json b/package.json index 736a24efd43..9960c360cba 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "scripts": { "build:miniconda": "curl -o ~/miniconda.sh https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh && bash ~/miniconda.sh -b -p $HOME/miniconda", - "build:pygmt": "conda env create -f environment.yml && source activate pygmt && conda install -c conda-forge -y gmt==6.1.0 && make install", + "build:pygmt": "conda env create -f environment.yml && source activate pygmt && conda install -c conda-forge -y gmt==6.1.1 && make install", "build:docs": "source activate pygmt && cd doc && make all && mv _build/html ../public", "build": "export PATH=$HOME/miniconda/bin:$PATH && npm run build:miniconda && npm run build:pygmt && npm run build:docs" } diff --git a/pygmt/clib/session.py b/pygmt/clib/session.py index c763d40fddf..d5ce3a8a4cb 100644 --- a/pygmt/clib/session.py +++ b/pygmt/clib/session.py @@ -119,7 +119,7 @@ class Session: """ # The minimum version of GMT required - required_version = "6.1.0" + required_version = "6.1.1" @property def session_pointer(self): diff --git a/pygmt/figure.py b/pygmt/figure.py index 2991b7e8a2c..d32588ae85d 100644 --- a/pygmt/figure.py +++ b/pygmt/figure.py @@ -316,14 +316,6 @@ def shift_origin(self, xshift=None, yshift=None): Shift plot origin in x direction. yshift : str Shift plot origin in y direction. - - Notes - ----- - For GMT 6.1.0, this function can't be used as the first plotting - function of :meth:`pygmt.Figure`, since it relies the *region* and - *projection* settings from previous commands. - - .. TODO: Remove the notes when PyGMT bumps to GMT>=6.1.1. """ self._preprocess() args = ["-T"] diff --git a/pygmt/tests/test_clib.py b/pygmt/tests/test_clib.py index a94c2c578bf..0e70bd945eb 100644 --- a/pygmt/tests/test_clib.py +++ b/pygmt/tests/test_clib.py @@ -402,10 +402,6 @@ def test_virtualfile_from_vectors(): assert output == expected -@pytest.mark.xfail( - condition=gmt_version < Version("6.1.1"), - reason="GMT_Put_Strings only works for GMT 6.1.1 and above", -) def test_virtualfile_from_vectors_one_string_column(): "Test passing in one column with string dtype into virtual file dataset" size = 5 @@ -421,10 +417,6 @@ def test_virtualfile_from_vectors_one_string_column(): assert output == expected -@pytest.mark.xfail( - condition=gmt_version < Version("6.1.1"), - reason="GMT_Put_Strings only works for GMT 6.1.1 and above", -) def test_virtualfile_from_vectors_two_string_columns(): "Test passing in two columns of string dtype into virtual file dataset" size = 5 @@ -688,7 +680,7 @@ def test_get_default(): with clib.Session() as lib: assert lib.get_default("API_GRID_LAYOUT") in ["rows", "columns"] assert int(lib.get_default("API_CORES")) >= 1 - assert Version(lib.get_default("API_VERSION")) >= Version("6.1.0") + assert Version(lib.get_default("API_VERSION")) >= Version("6.1.1") def test_get_default_fails(): diff --git a/pygmt/tests/test_clib_put_strings.py b/pygmt/tests/test_clib_put_strings.py index 6fc7885901a..ce8816b66e8 100644 --- a/pygmt/tests/test_clib_put_strings.py +++ b/pygmt/tests/test_clib_put_strings.py @@ -14,10 +14,6 @@ gmt_version = Version(_lib.info["version"]) -@pytest.mark.xfail( - condition=gmt_version < Version("6.1.1"), - reason="GMT_Put_Strings only works for GMT 6.1.1 and above", -) def test_put_strings(): "Check that assigning a numpy array of dtype str to a dataset works" with clib.Session() as lib: