Skip to content

Change GMT_IN|GMT_IS_REFERENCE to GMT_IN #517

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

Draft
wants to merge 36 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
8629f10
Chaneg GMT_IN|GMT_IS_REFERENCE to GMT_IN
seisman Jun 27, 2020
daca282
Merge branch 'master' into gmt-in
seisman Sep 6, 2020
1624232
Merge branch 'master' into gmt-in
seisman Sep 23, 2020
102e2c7
Merge branch 'master' into gmt-in
seisman Sep 27, 2020
67b410f
Merge branch 'master' into gmt-in
seisman Oct 16, 2020
804ad2b
Merge branch 'master' into gmt-in
seisman Oct 21, 2020
beb4413
Merge branch 'master' into gmt-in
seisman Nov 4, 2020
026944a
Merge branch 'master' into gmt-in
seisman Nov 16, 2020
0815fbb
Merge branch 'master' into gmt-in
seisman Dec 11, 2020
24c9ea3
Merge branch 'master' into gmt-in
seisman Dec 15, 2020
df8c4a7
Merge branch 'master' into gmt-in
seisman Dec 16, 2020
6146d38
Merge branch 'master' into gmt-in
seisman Dec 18, 2020
280b517
Merge branch 'master' into gmt-in
seisman Dec 20, 2020
25a9c83
Merge branch 'master' into gmt-in
seisman Dec 22, 2020
09dd91d
Merge branch 'master' into gmt-in
seisman Dec 23, 2020
263ed28
Merge branch 'master' into gmt-in
seisman Dec 23, 2020
22cc135
Merge branch 'master' into gmt-in
seisman Dec 29, 2020
5f83902
Merge branch 'master' into gmt-in
seisman Dec 31, 2020
ab6c6ab
Merge branch 'master' into gmt-in
seisman Jan 8, 2021
185947e
Merge branch 'master' into gmt-in
seisman Feb 2, 2021
d13ed56
Merge branch 'master' into gmt-in
seisman Feb 11, 2021
8ea019a
Merge branch 'master' into gmt-in
seisman Feb 12, 2021
d2c071a
Merge branch 'master' into gmt-in
seisman Feb 28, 2021
8c89f59
Always enable Dev Tests in this branch
seisman Feb 28, 2021
97eb442
Merge branch 'master' into gmt-in
seisman Mar 6, 2021
b1f4133
Merge branch 'master' into gmt-in
seisman Mar 13, 2021
307e39e
Merge branch 'master' into gmt-in
seisman Apr 6, 2021
bf8da42
Merge branch 'master' into gmt-in
weiji14 Apr 23, 2021
f83ef20
Merge branch 'master' into gmt-in
seisman May 15, 2021
4594bae
Merge branch 'master' into gmt-in
seisman May 28, 2021
51d53f7
Merge branch 'main' into gmt-in
seisman Oct 5, 2021
2a0361a
Merge branch 'main' into gmt-in
weiji14 Nov 7, 2021
388d3a2
Run tests on table-alloc-mode branch
weiji14 Nov 7, 2021
b59fe12
Merge branch 'main' into gmt-in
seisman Mar 5, 2022
bd0e7e0
Merge branch 'main' into gmt-in
seisman Dec 20, 2022
43266c3
Merge branch 'main' into gmt-in
seisman Jun 11, 2025
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
6 changes: 4 additions & 2 deletions .github/workflows/ci_tests_dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@
name: GMT Dev Tests

on:
# push:
# branches: [ main ]
push:
branches:
- main
- gmt-in
pull_request:
types: [ opened, reopened, labeled, synchronize ]
paths:
Expand Down
15 changes: 5 additions & 10 deletions pygmt/clib/session.py
Original file line number Diff line number Diff line change
Expand Up @@ -1337,7 +1337,7 @@ def open_virtualfile(
... lib.put_vector(dataset, column=0, vector=x)
... lib.put_vector(dataset, column=1, vector=y)
... # Add the dataset to a virtual file
... vfargs = (family, geometry, "GMT_IN|GMT_IS_REFERENCE", dataset)
... vfargs = (family, geometry, "GMT_IN", dataset)
... with lib.open_virtualfile(*vfargs) as vfile:
... # Send the output to a temp file so that we can read it
... with GMTTempFile() as ofile:
Expand Down Expand Up @@ -1488,9 +1488,7 @@ def virtualfile_from_vectors(self, vectors: Sequence) -> Generator[str, None, No
dataset, family="GMT_IS_VECTOR|GMT_IS_DUPLICATE", strings=strings
)

with self.open_virtualfile(
family, geometry, "GMT_IN|GMT_IS_REFERENCE", dataset
) as vfile:
with self.open_virtualfile(family, geometry, "GMT_IN", dataset) as vfile:
yield vfile

@contextlib.contextmanager
Expand Down Expand Up @@ -1565,9 +1563,7 @@ def virtualfile_from_matrix(self, matrix: np.ndarray) -> Generator[str, None, No

self.put_matrix(dataset, matrix)

with self.open_virtualfile(
family, geometry, "GMT_IN|GMT_IS_REFERENCE", dataset
) as vfile:
with self.open_virtualfile(family, geometry, "GMT_IN", dataset) as vfile:
yield vfile

@contextlib.contextmanager
Expand Down Expand Up @@ -1649,9 +1645,8 @@ def virtualfile_from_grid(self, grid: xr.DataArray) -> Generator[str, None, None
registration=_reg, # type: ignore[arg-type]
)
self.put_matrix(gmt_grid, matrix)
with self.open_virtualfile(
family, geometry, "GMT_IN|GMT_IS_REFERENCE", gmt_grid
) as vfile:
args = (family, geometry, "GMT_IN", gmt_grid)
with self.open_virtualfile(*args) as vfile:
yield vfile

@contextlib.contextmanager
Expand Down
4 changes: 2 additions & 2 deletions pygmt/tests/test_clib_virtualfiles.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def test_open_virtualfile(dtypes):
data = np.arange(shape[0] * shape[1], dtype=dtype).reshape(shape)
lib.put_matrix(dataset, matrix=data)
# Add the dataset to a virtual file and pass it along to gmt info
vfargs = (family, geometry, "GMT_IN|GMT_IS_REFERENCE", dataset)
vfargs = (family, geometry, "GMT_IN", dataset)
with lib.open_virtualfile(*vfargs) as vfile:
with GMTTempFile() as outfile:
lib.call_module("info", [vfile, f"->{outfile.name}"])
Expand All @@ -68,7 +68,7 @@ def test_open_virtualfile_fails():
vfargs = (
"GMT_IS_DATASET|GMT_VIA_MATRIX",
"GMT_IS_POINT",
"GMT_IN|GMT_IS_REFERENCE",
"GMT_IN",
None,
)

Expand Down
Loading