Skip to content

Bump the required minimum GMT version to 6.1.1 #577

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.

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

Merged
merged 3 commits into from
Sep 2, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/cache_data.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion doc/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <https://www.generic-mapping-tools.org>`__.
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 <https://docs.generic-mapping-tools.org/latest/cookbook/introduction.html#modern-and-classic-mode>`__.

Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ channels:
dependencies:
- python=3.7
- pip
- gmt=6.1.0
- gmt=6.1.1
- numpy
- pandas
- xarray
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion pygmt/clib/session.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
8 changes: 0 additions & 8 deletions pygmt/figure.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
10 changes: 1 addition & 9 deletions pygmt/tests/test_clib.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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():
Expand Down
4 changes: 0 additions & 4 deletions pygmt/tests/test_clib_put_strings.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down