Skip to content
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

Upgrade gmt from 6.0.0rc1 to 6.0.0rc4 #327

Merged
merged 6 commits into from
Oct 1, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Bump minimum required version to 6.0.0rc4 and stop using psbasemap
Change minimum required GMT version from 6.0.0rc1 to 6.0.0rc4. Also switched to using modern mode `basemap` instead of `psbasemap`, and `coast` instead of `pscoast`.
  • Loading branch information
weiji14 committed Sep 24, 2019
commit 166655feb087d4794415996aff840d10f6c03fc1
6 changes: 3 additions & 3 deletions pygmt/clib/session.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class Session:
library in the directory specified by it.

A ``GMTVersionError`` exception will be raised if the GMT shared library reports a
version < 6.0.0rc1.
version < 6.0.0rc4.

The ``session_pointer`` attribute holds a ctypes pointer to the currently open
session.
Expand Down Expand Up @@ -112,7 +112,7 @@ class Session:
"""

# The minimum version of GMT required
required_version = "6.0.0rc1"
required_version = "6.0.0rc4"

@property
def session_pointer(self):
Expand Down Expand Up @@ -463,7 +463,7 @@ def call_module(self, module, args):
Parameters
----------
module : str
Module name (``'pscoast'``, ``'psbasemap'``, etc).
Module name (``'coast'``, ``'basemap'``, etc).
args : str
String with the command line arguments that will be passed to the
module (for example, ``'-R0/5/0/10 -JM'``).
Expand Down
2 changes: 1 addition & 1 deletion pygmt/tests/test_clib.py
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,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.0.0rc1")
assert Version(lib.get_default("API_VERSION")) >= Version("6.0.0rc4")


def test_get_default_fails():
Expand Down
2 changes: 1 addition & 1 deletion pygmt/tests/test_session_management.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def test_begin_end():

begin()
with Session() as lib:
lib.call_module("psbasemap", "-R10/70/-3/8 -JX4i/3i -Ba")
lib.call_module("basemap", "-R10/70/-3/8 -JX4i/3i -Ba")
end()

begin() # Restart the global session
Expand Down