Skip to content

Commit a3d6f84

Browse files
authored
Bump the required minimum GMT version to 6.1.1 (#577)
* Remove note on shift_origin added in #536 * Remove xfails for put_strings added in #520
1 parent fc246e7 commit a3d6f84

File tree

10 files changed

+8
-28
lines changed

10 files changed

+8
-28
lines changed

.github/workflows/cache_data.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
# Install GMT
2424
- name: Install GMT
2525
shell: bash -l {0}
26-
run: conda install -c conda-forge gmt=6.1.0
26+
run: conda install -c conda-forge gmt=6.1.1
2727

2828
# Download remote files
2929
- name: Download remote data

.github/workflows/ci_tests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
requirements_file=full-conda-requirements.txt
7878
cat requirements.txt requirements-dev.txt > $requirements_file
7979
cat << EOF >> $requirements_file
80-
gmt=6.1.0
80+
gmt=6.1.1
8181
make
8282
codecov
8383
EOF

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ env:
2626
# The file with the listed requirements to be installed by conda
2727
- CONDA_REQUIREMENTS=requirements.txt
2828
- CONDA_REQUIREMENTS_DEV=requirements-dev.txt
29-
- CONDA_INSTALL_EXTRA="codecov twine gmt=6.1.0"
29+
- CONDA_INSTALL_EXTRA="codecov twine gmt=6.1.1"
3030
# These variables control which actions are performed in a build
3131
- DEPLOY=false
3232

doc/install.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Which GMT?
3131
PyGMT requires Generic Mapping Tools (GMT) version 6 as a minimum, which is the latest
3232
released version that can be found at
3333
the `GMT official site <https://www.generic-mapping-tools.org>`__.
34-
We need the latest GMT (>=6.1.0) since there are many changes being made to GMT itself in
34+
We need the latest GMT (>=6.1.1) since there are many changes being made to GMT itself in
3535
response to the development of PyGMT, mainly the new
3636
`modern execution mode <https://docs.generic-mapping-tools.org/latest/cookbook/introduction.html#modern-and-classic-mode>`__.
3737

environment.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ channels:
55
dependencies:
66
- python=3.7
77
- pip
8-
- gmt=6.1.0
8+
- gmt=6.1.1
99
- numpy
1010
- pandas
1111
- xarray

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"scripts": {
33
"build:miniconda": "curl -o ~/miniconda.sh https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh && bash ~/miniconda.sh -b -p $HOME/miniconda",
4-
"build:pygmt": "conda env create -f environment.yml && source activate pygmt && conda install -c conda-forge -y gmt==6.1.0 && make install",
4+
"build:pygmt": "conda env create -f environment.yml && source activate pygmt && conda install -c conda-forge -y gmt==6.1.1 && make install",
55
"build:docs": "source activate pygmt && cd doc && make all && mv _build/html ../public",
66
"build": "export PATH=$HOME/miniconda/bin:$PATH && npm run build:miniconda && npm run build:pygmt && npm run build:docs"
77
}

pygmt/clib/session.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ class Session:
119119
"""
120120

121121
# The minimum version of GMT required
122-
required_version = "6.1.0"
122+
required_version = "6.1.1"
123123

124124
@property
125125
def session_pointer(self):

pygmt/figure.py

-8
Original file line numberDiff line numberDiff line change
@@ -316,14 +316,6 @@ def shift_origin(self, xshift=None, yshift=None):
316316
Shift plot origin in x direction.
317317
yshift : str
318318
Shift plot origin in y direction.
319-
320-
Notes
321-
-----
322-
For GMT 6.1.0, this function can't be used as the first plotting
323-
function of :meth:`pygmt.Figure`, since it relies the *region* and
324-
*projection* settings from previous commands.
325-
326-
.. TODO: Remove the notes when PyGMT bumps to GMT>=6.1.1.
327319
"""
328320
self._preprocess()
329321
args = ["-T"]

pygmt/tests/test_clib.py

+1-9
Original file line numberDiff line numberDiff line change
@@ -402,10 +402,6 @@ def test_virtualfile_from_vectors():
402402
assert output == expected
403403

404404

405-
@pytest.mark.xfail(
406-
condition=gmt_version < Version("6.1.1"),
407-
reason="GMT_Put_Strings only works for GMT 6.1.1 and above",
408-
)
409405
def test_virtualfile_from_vectors_one_string_column():
410406
"Test passing in one column with string dtype into virtual file dataset"
411407
size = 5
@@ -421,10 +417,6 @@ def test_virtualfile_from_vectors_one_string_column():
421417
assert output == expected
422418

423419

424-
@pytest.mark.xfail(
425-
condition=gmt_version < Version("6.1.1"),
426-
reason="GMT_Put_Strings only works for GMT 6.1.1 and above",
427-
)
428420
def test_virtualfile_from_vectors_two_string_columns():
429421
"Test passing in two columns of string dtype into virtual file dataset"
430422
size = 5
@@ -688,7 +680,7 @@ def test_get_default():
688680
with clib.Session() as lib:
689681
assert lib.get_default("API_GRID_LAYOUT") in ["rows", "columns"]
690682
assert int(lib.get_default("API_CORES")) >= 1
691-
assert Version(lib.get_default("API_VERSION")) >= Version("6.1.0")
683+
assert Version(lib.get_default("API_VERSION")) >= Version("6.1.1")
692684

693685

694686
def test_get_default_fails():

pygmt/tests/test_clib_put_strings.py

-4
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414
gmt_version = Version(_lib.info["version"])
1515

1616

17-
@pytest.mark.xfail(
18-
condition=gmt_version < Version("6.1.1"),
19-
reason="GMT_Put_Strings only works for GMT 6.1.1 and above",
20-
)
2117
def test_put_strings():
2218
"Check that assigning a numpy array of dtype str to a dataset works"
2319
with clib.Session() as lib:

0 commit comments

Comments
 (0)