yarns: Adapt to put morphologies in subdirsbaserock/richardmaw/S11284/morphologies-by-path-v4

We want to move our morphologies in our definitions repository into
subdirectories, so they're more organised.

We'd prefer to only refer to morphologies by file path, rather than a
name that loosely corresponds to the file path, but we need to support
that for backwards compatibility until we can move all of our
morphologies into the definitions repository.

However, since we want to eventually remove this, and we want to ensure
that file paths work, we change the yarn tests to use file paths.

1 files changed, 1 insertions, 5 deletions

diff --git a/scripts/edit-morph b/scripts/edit-morph
index 2b81747c..d0b793a4 100755
--- a/scripts/edit-morph
+++ b/scripts/edit-morph
@@ -283,13 +283,9 @@ class EditMorph(cliapp.Application):
         return system
 
     def cmd_cluster_init(self, (cluster_file,)):
-        suffix = '.morph'
-        if not cluster_file.endswith(suffix):
-            raise cliapp.AppException(
-                "Morphology file path must end with .morph")
         with open(cluster_file, 'w') as f:
             d = {
-                'name': os.path.basename(cluster_file)[:-len(suffix)],
+                'name': os.path.splitext(os.path.basename(cluster_file))[0],
                 'kind': 'cluster',
             }
             yaml.dump(d, f)