move config, training_profiles into sleap dir

eberrigan · Jun 24, 2019 · eda4c03 · eda4c03
1 parent d45adcf
commit eda4c03
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 7 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,2 +1,2 @@
-include config/*.yaml
-include training_profiles/*.json
+include sleap/config/*.yaml
+include sleap/training_profiles/*.json
diff --git a/config/active.yaml → sleap/config/active.yaml b/config/active.yaml → sleap/config/active.yaml
diff --git a/config/shortcuts.yaml → sleap/config/shortcuts.yaml b/config/shortcuts.yaml → sleap/config/shortcuts.yaml
diff --git a/config/suggestions.yaml → sleap/config/suggestions.yaml b/config/suggestions.yaml → sleap/config/suggestions.yaml
diff --git a/config/training_editor.yaml → sleap/config/training_editor.yaml b/config/training_editor.yaml → sleap/config/training_editor.yaml
diff --git a/sleap/gui/active.py b/sleap/gui/active.py
@@ -20,11 +20,11 @@ def __init__(self, labels_filename: str, labels: Labels, *args, **kwargs):
         from sleap.nn.model import ModelOutputType
         from sleap.nn.training import TrainingJob
 
-        learning_yaml = resource_filename(Requirement.parse("sleap"),"config/active.yaml")
+        learning_yaml = resource_filename(Requirement.parse("sleap"),"sleap/config/active.yaml")
         self.form_widget = YamlFormWidget(yaml_file=learning_yaml, title="Active Learning Settings")
 
         # load list of job profiles from directory
-        self.job_options = find_saved_jobs(resource_filename(Requirement.parse("sleap"),"training_profiles"))
+        self.job_options = find_saved_jobs(resource_filename(Requirement.parse("sleap"),"sleap/training_profiles"))
 
         # form ui
 

diff --git a/sleap/gui/app.py b/sleap/gui/app.py
@@ -121,7 +121,7 @@ def filename(self, x):
 
     def initialize_gui(self):
 
-        shortcut_yaml = resource_filename(Requirement.parse("sleap"),"config/shortcuts.yaml")
+        shortcut_yaml = resource_filename(Requirement.parse("sleap"),"sleap/config/shortcuts.yaml")
         with open(shortcut_yaml, 'r') as f:
             shortcuts = yaml.load(f, Loader=yaml.SafeLoader)
 
@@ -334,7 +334,7 @@ def update_instance_table_selection():
         hbw = QWidget(); hbw.setLayout(hb)
         suggestions_layout.addWidget(hbw)
 
-        suggestions_yaml = resource_filename(Requirement.parse("sleap"),"config/suggestions.yaml")
+        suggestions_yaml = resource_filename(Requirement.parse("sleap"),"sleap/config/suggestions.yaml")
         form_wid = YamlFormWidget(yaml_file=suggestions_yaml, title="Generate Suggestions")
         form_wid.mainAction.connect(self.generateSuggestions)
         suggestions_layout.addWidget(form_wid)

diff --git a/sleap/gui/training_editor.py b/sleap/gui/training_editor.py
@@ -15,7 +15,7 @@ class TrainingEditor(QtWidgets.QDialog):
     def __init__(self, profile_filename: Optional[str]=None, *args, **kwargs):
         super(TrainingEditor, self).__init__()
 
-        form_yaml = resource_filename(Requirement.parse("sleap"),"config/training_editor.yaml")
+        form_yaml = resource_filename(Requirement.parse("sleap"),"sleap/config/training_editor.yaml")
 
         self.form_widgets = dict()
         self.form_widgets["model"] = YamlFormWidget(form_yaml, "model", "Network Architecture")

diff --git a/training_profiles/default_confmaps.json → ...p/training_profiles/default_confmaps.json b/training_profiles/default_confmaps.json → ...p/training_profiles/default_confmaps.json
diff --git a/training_profiles/default_pafs.json → sleap/training_profiles/default_pafs.json b/training_profiles/default_pafs.json → sleap/training_profiles/default_pafs.json