Pass in NULL pointer to GMT_Get_Enum #224

akshmakov · 2018-08-07T06:37:27Z

Updated gmt.clib.Session.__getitem__ to reflect update GMT 6.0.0 API for for GMT_Get_Enum.
This update breaks compatability with trunk revisions prior to r20437. However,
a rudimentary check is done to try to indicate to the user. It can be removed
once GMT 6.0.0 is released.

Additionally, session handling has been added to __getitem__ to use the
session pointer if there is an open session.

Warning added to API documentation

Fixes #222

Black is Python 3.6 only so installing it through the requirements.txt file was causing a silent upgrade of Python.

welcome · 2018-08-07T06:37:29Z

💖 Thanks for opening this pull request! 💖

Please make sure you read our contributing guidelines and abide by our code of conduct.

A few things to keep in mind:

Remember to run make format to make sure your code follows our style guide.
If you need help writing tests, take a look at the existing ones for inspiration. If you don't know where to start, let us know and we'll walk you through it.
All new features should be documented. It helps to write the docstrings for your functions/classes before writing the code. This will help you think about your code design and results in better code.
No matter what, we are really grateful that you put in the effort to do this! 🎉

stickler-ci · 2018-08-07T06:37:35Z

gmt/clib/session.py

@@ -196,6 +196,11 @@ def __getitem__(self, name):

        Used to set configuration values for other API calls. Wraps ``GMT_Get_Enum``.

+        .. warning::
+


W293 blank line contains whitespace

stickler-ci · 2018-08-07T06:37:35Z

gmt/clib/session.py

@@ -196,6 +196,11 @@ def __getitem__(self, name):

        Used to set configuration values for other API calls. Wraps ``GMT_Get_Enum``.

+        .. warning::
+
+            This call will fail with GMT 6.0.0 trunk revisions prior to r20437 


W291 trailing whitespace

stickler-ci · 2018-08-07T06:37:36Z

gmt/clib/session.py

-        value = c_get_enum(name.encode())
+        # None type is valid for API purposes, so this is safe always
+        # Constants can be queried before session is created (chicken-or-egg)
+        # so we are not guaranteed a valid session pointer 


W291 trailing whitespace

stickler-ci · 2018-08-07T06:37:36Z

gmt/clib/session.py

+            session = self.session_pointer
+        except GMTCLibNoSessionError:
+            session = None
+


W293 blank line contains whitespace

stickler-ci · 2018-08-07T06:37:36Z

gmt/clib/session.py

-        padding = self["GMT_PAD_DEFAULT"]
-        session_type = self["GMT_SESSION_EXTERNAL"]
+        # While GMT 6.0.0 is in development, this check is necessary to
+        # prevent confusion with older development builds 


W291 trailing whitespace

stickler-ci · 2018-08-07T06:37:36Z

gmt/clib/session.py

+            session_type = self["GMT_SESSION_EXTERNAL"]
+        except GMTCLibError as e:
+            raise GMTCLibError("Ensure GMT 6.0.0 is r20437 or later ") from e
+


W293 blank line contains whitespace

stickler-ci · 2018-08-07T06:37:36Z

gmt/clib/session.py

        session = c_create_session(name.encode(), padding, session_type, print_func)
+


W293 blank line contains whitespace

akshmakov · 2018-08-07T06:46:05Z

@leouieda I will resolve the White space issues, but please review this approach vs the dead simple one in c539b62

stickler-ci · 2018-08-07T06:52:15Z

gmt/clib/session.py

        session = c_create_session(name.encode(), padding, session_type, print_func)
+


W293 blank line contains whitespace

for `GMT_Get_Enum`. Resolves GenericMappingTools#222 This update breaks compatability with trunk revisions prior to r20437. However, a rudimentary check is done to try to indicate to the user. It can be removed once GMT 6.0.0 is released. Additionally, session handling has been added to `__getitem__` to use the session pointer if there is an open session. Warning added to API documentation

We don't really need those. GMT6 is not released yet and we assume that people have the latest version. We'll end up forgetting to remove these checks later so it's best to not have them.

leouieda · 2018-08-13T16:28:11Z

Hi @akshmakov, sorry for the huge delay in responding. I was busy trying to get GMT building on conda again so that we could run the CI.

This is great! Thanks for doing it! I went ahead and made a few changes to remove the try/except checks. We don't need those because GMT6 isn't out yet and we'll endup forgetting to remove them. As soon as the CI passes I'll merge this.

Thanks, I really appreciate it!

leouieda · 2018-08-16T01:04:10Z

Closes #216 as well

leouieda · 2018-08-17T04:05:06Z

OK, this seems to be a problem with the OSX conda package for GMT (again). I'm merging this the way it is so that we can move on. This has been a very frustrating month on conda-forge.

welcome · 2018-08-17T04:06:41Z

🎉🎉🎉 Congrats on merging your first pull request and welcome to the team! 🎉🎉🎉

Please open a new pull request to add yourself to the AUTHORS.md file. We hope that this was a good experience for you. Let us know if there is any way that the contributing process could be improved.

leouieda added 2 commits July 23, 2018 18:49

Don't install black on TravisCI automatically

f5df139

Black is Python 3.6 only so installing it through the requirements.txt file was causing a silent upgrade of Python.

check that Python is still correct

b83b8b1

stickler-ci reviewed Aug 7, 2018

View reviewed changes

akshmakov force-pushed the pr/get-enum-api#222 branch from 6f107b8 to f208f2e Compare August 7, 2018 06:55

akshmakov changed the title ~~GMT_Get_Enum API Update in gmt.clib.Session.__getitem~~ GMT_Get_Enum API Update in gmt.clib.Session.__getitem__ Aug 8, 2018

akshmakov mentioned this pull request Aug 9, 2018

GMT on Ubuntu 18.04 #215

Closed

Remove the warnings and try/except checks

74689f3

We don't really need those. GMT6 is not released yet and we assume that people have the latest version. We'll end up forgetting to remove these checks later so it's best to not have them.

leouieda changed the title ~~GMT_Get_Enum API Update in gmt.clib.Session.__getitem__~~ Pass in NULL pointer to GMT_Get_Enum Aug 13, 2018

leouieda added 6 commits August 13, 2018 11:33

Try making Travis get things from conda-forge

8ebff0f

Remove defaults from the conda env

e8808a7

Merge branch 'black' into pr/get-enum-api#222

5476166

Try out a different syntax for conda install

fd7603a

Defaults is removed by CI scripts

3b35ee7

Use quotes

bb970fd

leouieda mentioned this pull request Aug 16, 2018

Fix GMT6 library not found error #221

Closed

leouieda added 4 commits August 15, 2018 15:05

Try using >=

71b74ba

Quote the requirement version

df30ef5

don't use >=

113ce43

Install GMT from the requirements file

07bd2e0

leouieda mentioned this pull request Aug 16, 2018

libpoppler.so.76: cannot open shared object file: No such file or directory #223

Closed

leouieda merged commit 13bac6c into GenericMappingTools:master Aug 17, 2018

leouieda mentioned this pull request Aug 17, 2018

Don't install black on TravisCI automatically #216

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Pass in NULL pointer to GMT_Get_Enum #224

Pass in NULL pointer to GMT_Get_Enum #224

Uh oh!

akshmakov commented Aug 7, 2018

Uh oh!

welcome bot commented Aug 7, 2018

Uh oh!

stickler-ci Aug 7, 2018

Uh oh!

stickler-ci Aug 7, 2018

Uh oh!

stickler-ci Aug 7, 2018

Uh oh!

stickler-ci Aug 7, 2018

Uh oh!

stickler-ci Aug 7, 2018

Uh oh!

stickler-ci Aug 7, 2018

Uh oh!

stickler-ci Aug 7, 2018

Uh oh!

akshmakov commented Aug 7, 2018

Uh oh!

stickler-ci Aug 7, 2018

Uh oh!

leouieda commented Aug 13, 2018

Uh oh!

leouieda commented Aug 16, 2018

Uh oh!

leouieda commented Aug 17, 2018

Uh oh!

welcome bot commented Aug 17, 2018

Uh oh!

Uh oh!

		@@ -196,6 +196,11 @@ def __getitem__(self, name):

		Used to set configuration values for other API calls. Wraps ``GMT_Get_Enum``.

		.. warning::

		session = c_create_session(name.encode(), padding, session_type, print_func)

Pass in NULL pointer to GMT_Get_Enum #224

Pass in NULL pointer to GMT_Get_Enum #224

Uh oh!

Conversation

akshmakov commented Aug 7, 2018

Uh oh!

welcome bot commented Aug 7, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

akshmakov commented Aug 7, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

leouieda commented Aug 13, 2018

Uh oh!

leouieda commented Aug 16, 2018

Uh oh!

leouieda commented Aug 17, 2018

Uh oh!

welcome bot commented Aug 17, 2018

Uh oh!

Uh oh!