Merge pull request #348 from gadomski/fix/read-file

Remove duplicate `read_text` without orjson

Author: Jon Duckworth

.github/workflows/continuous-integration.yml

@@ -39,3 +39,14 @@ jobs:
           token: ${{ secrets.CODECOV_TOKEN }}
           file: ./coverage.xml
           fail_ci_if_error: false 
+  vanilla:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+        with:
+          python-version: "3.8"
+      - name: Install without orjson
+        run: pip install '.[validation]'
+      - name: Run unittests
+        run: python -m unittest discover tests

.style.yapf

@@ -6,6 +6,10 @@
 
 ### Changed
 
+### Fixed
+
+- Reading json without orjson ([#348](https://github.com/stac-utils/pystac/pull/348))
+
 ### Remove
 
 ## [1.0.0-beta.1]

CHANGELOG.md

@@ -23,7 +23,7 @@
 
 # Use orjson if available
 try:
-    import orjson
+    import orjson  # type: ignore
 except ImportError:
     orjson = None
 
@@ -77,7 +77,7 @@ def _json_loads(self, txt: str, source: Union[str, "Link_Type"]) -> Dict[str, An
         if orjson is not None:
             return orjson.loads(txt)
         else:
-            return json.loads(self.read_text(txt))
+            return json.loads(txt)
 
     def _json_dumps(
         self, json_dict: Dict[str, Any], source: Union[str, "Link_Type"]

pystac/stac_io.py

@@ -9,7 +9,7 @@ fi
 function usage() {
     echo -n \
         "Usage: $(basename "$0")
-Format code with yapf
+Format code with black
 "
 }
 

scripts/format

@@ -1,6 +1,7 @@
 import unittest
 import warnings
 
+import pystac
 from pystac.stac_io import STAC_IO
 from tests.utils import TestCases
 
@@ -18,3 +19,8 @@ def test_stac_io_issues_warnings(self):
             # Verify some things
             self.assertEqual(len(w), 1)
             self.assertTrue(issubclass(w[-1].category, DeprecationWarning))
+
+    def test_read_text(self):
+        _ = pystac.read_file(
+            TestCases.get_path("data-files/collections/multi-extent.json")
+        )