Fixed changes while merging development

Author: enicolasgomez

Dockerfile

@@ -35,5 +35,5 @@ RUN python install.py ${BUILD_ARGS} --geppetto ${GEPPETTO_VERSION}
 WORKDIR ${INSTALLATION_FOLDER}
 
 RUN pip install -r requirements-test.txt
-# RUN pytest tests/backend
+RUN pytest tests/backend
 CMD /bin/bash -c "jupyter notebook --NotebookApp.default_url=/geppetto --NotebookApp.token='' --library=netpyne_ui --NotebookApp.disable_check_xsrf=True"

netpyne_ui/netpyne_geppetto.py

@@ -593,7 +593,7 @@ def exportModel(self, args):
                 sim.saveData(include)
                 sim.cfg.saveJson = False
 
-                with open(f"{sim.cfg.filename}.json") as json_file:
+                with open(f"{sim.cfg.filename}_data.json") as json_file:
                     data = json.load(json_file)
                     return data