Switch lockfiles to json (#18)

as yaml safe load is too slow

Author: ruffsl

colcon_cache/cache/__init__.py

@@ -5,9 +5,8 @@
 import pathlib
 
 from colcon_core.plugin_system import satisfies_version
-import yaml
 
-LOCKFILE_FILENAME = 'colcon_{verb_name}.yaml'
+LOCKFILE_FILENAME = 'colcon_{verb_name}.json'
 LOCKFILE_VERSION = '0.0.1'
 
 
@@ -78,8 +77,8 @@ def update_dependencies(self, dep_lockfiles):  # noqa: D10s
                 dep_lockfile.checksums.current
 
     def load(self, path):  # noqa: D102
-        content = path.read_text()
-        data = yaml.safe_load(content)
+        with open(path, 'r') as f:
+            data = json.load(f)
         satisfies_version(data['version'], '^0.0.1')
 
         self.lock_type = data['lock_type']
@@ -90,10 +89,13 @@ def load(self, path):  # noqa: D102
             self.metadata = data['metadata']
 
     def dump(self, path):  # noqa: D102
-        data = json.loads(
-            json.dumps(self, default=lambda o: o.__dict__))
-        path.write_text(
-            yaml.dump(data, sort_keys=True))
+        with open(path, 'w') as f:
+            json.dump(
+                obj=self,
+                fp=f,
+                indent=2,
+                default=lambda o: o.__dict__,
+                sort_keys=True)
 
 
 def get_lockfile_path(package_build_base, verb_name):

requirements.txt

@@ -1,4 +1,3 @@
 dirhash
 git+https://github.com/colcon/colcon-core
 GitPython
-PyYAML

setup.cfg

@@ -29,7 +29,6 @@ install_requires =
   colcon-core>=0.5.2
   dirhash
   GitPython
-  PyYAML
 packages = find:
 tests_require =
   flake8>=3.6.0

test/cache/colcon_cache_example_1.json

@@ -0,0 +1,13 @@
+{
+  "checksums": {
+    "current": "123",
+    "reference": "123"
+  },
+  "dependencies": {
+    "bar": "456",
+    "foo": "123"
+  },
+  "lock_type": "foo",
+  "metadata": {},
+  "version": "0.0.1"
+}

test/cache/colcon_cache_example_1.yaml

@@ -0,0 +1,12 @@
+{
+  "checksums": {
+    "current": "456",
+    "reference": "123"
+  },
+  "dependencies": {},
+  "lock_type": "foo",
+  "metadata": {
+    "baz": "spam"
+  },
+  "version": "0.0.1"
+}

test/cache/colcon_cache_example_2.json

@@ -43,4 +43,3 @@ thomas
 todo
 unmerged
 wildcard
-yaml

test/cache/colcon_cache_example_2.yaml

@@ -106,7 +106,7 @@ def test_cache_package():
             assert not rc
 
             build_base = Path(dirhash_lock_task.context.args.build_base)
-            assert Path(build_base, 'cache/colcon_lock.yaml').exists()
+            assert Path(build_base, 'cache/colcon_lock.json').exists()
 
     finally:
         event_loop.close()

test/spell_check.words

@@ -49,7 +49,7 @@ def test_cache_lockfile():
         lockfile_a_path.parent.mkdir(parents=True, exist_ok=True)
         lockfile_c_path = pathlib.Path(
             pathlib.Path(__file__).parent.absolute(),
-            'cache', 'colcon_cache_example_1.yaml')
+            'cache', 'colcon_cache_example_1.json')
         lockfile_a.dump(lockfile_a_path)
         assert lockfile_a_path.read_text() == lockfile_c_path.read_text()
 
@@ -61,7 +61,7 @@ def test_cache_lockfile():
         lockfile_b_path.parent.mkdir(parents=True, exist_ok=True)
         lockfile_d_path = pathlib.Path(
             pathlib.Path(__file__).parent.absolute(),
-            'cache', 'colcon_cache_example_2.yaml')
+            'cache', 'colcon_cache_example_2.json')
         lockfile_b.dump(lockfile_b_path)
         assert lockfile_b_path.read_text() == lockfile_d_path.read_text()