Dropping the jsonmerge dependency

anaconda · Apr 20, 2020 · a8bb9d1 · a8bb9d1
1 parent 75e7358
commit a8bb9d1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,6 @@
 FROM leader.telekube.local:5000/ae-editor:5.4.0-46.g640c57da1
 COPY . /aesrc/vscode/
 RUN set -ex \
-    && /opt/continuum/anaconda/condabin/conda install -c defusco jsonmerge -y -n lab_launch \
     && rm -f /usr/bin/git /usr/bin/git-* \
     && for fname in /opt/continuum/anaconda/envs/lab_launch/bin/{git,git-*}; do \
            ln -s $fname /usr/bin/; \

diff --git a/merge_vscode_settings.py b/merge_vscode_settings.py
@@ -19,7 +19,6 @@
 import sys
 import os
 import json
-import jsonmerge
 
 user_settings_path = sys.argv[1]
 
@@ -81,7 +80,7 @@
             % (user_settings_path, merged_settings_path))
       f.write(merged_settings)
 else:
-   merged_json = jsonmerge.merge(user_json, project_json)
+   user_json.update(project_json)
    with open(merged_settings_path, 'w') as f:
       print('Writing merged settings to %s' % merged_settings_path)
-      f.write(json.dumps(merged_json, indent=4, sort_keys=True))
+      f.write(json.dumps(user_json, indent=4, sort_keys=True))