Clean up import of isi_sdk_7_2 and pytest #17
Conversation
…into feat_js_tests Fix merge conflict in Makefile
cbrainerd
changed the title
|
Fixes #16 |
| @@ -5,10 +5,10 @@ | |||
| try: | |||
| # Try the original SDK library name | |||
| import isi_sdk | |||
There was a problem hiding this comment.
Seems like this should be:
import isi_sdk_7_2or
import isi_sdk_7_2 as isi_sdkThere was a problem hiding this comment.
The intent here is to allow functioning with either isi_sdk_7_2 or the original and now deprecated isi_sdk library.
So it first tries importing isi_sdk_7_2, if that fails then it tries for the deprecated SDK library.
| @@ -14,10 +14,10 @@ | |||
| try: | |||
| # Try the original SDK library name | |||
| import isi_sdk | |||
There was a problem hiding this comment.
Same situation here with allowing either isi_sdk or isi_sdk_7_2
| @@ -1,3 +1,4 @@ | |||
| future>=0.15.2 | |||
| jinja2>=2.8 | |||
| urllib3 >= 1.15 | |||
| urllib3>=1.15 | |||
| isi_sdk_7_2>=0.1.2 | |||
There was a problem hiding this comment.
0.2.x contains backwards-incompatible changes (see #19).
| isi_sdk_7_2>=0.1.2 | |
| isi_sdk_7_2~=0.1.2 |
The compatible release operator should cause the latest compatible isi_sdk_7_2 to be installed (currently, 0.1.11).
| @@ -5,3 +5,4 @@ mock>=2.0.0 | |||
| jinja2>=2.8 | |||
| pylint>=1.5.5 | |||
| urllib3 >= 1.15 | |||
| isi_sdk_7_2>=0.1.2 | |||
There was a problem hiding this comment.
Consider referencing requirements.txt instead of duplicating it here.
| isi_sdk_7_2>=0.1.2 | |
| -r requirements.txt |
Summary
This PR cleans up some issues lingering with the rename of isi_sdk to isi_sdk_7_2 and the the move to PyPI distribution along with an import of pytest that was occurring when hexaparse was run from CLI.
Testing done