From dfaf0d06032bae4f49fb07a98326a41aa1f492e6 Mon Sep 17 00:00:00 2001 From: Bruce Martin Date: Thu, 2 Jan 2020 15:44:40 -0800 Subject: [PATCH] allow hyphen in annotation file name (#1074) * remove old detritus * allow hyphen in label file name --- server/app/rest_api/rest.py | 2 +- server/app/scanpy_engine/labels.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/server/app/rest_api/rest.py b/server/app/rest_api/rest.py index 32342e18..f6c60e98 100644 --- a/server/app/rest_api/rest.py +++ b/server/app/rest_api/rest.py @@ -221,7 +221,7 @@ def is_safe_collection_name(name): """ if name is None: return False - return re.match(r"^\w+$", name) is not None + return re.match(r"^[\w\-]+$", name) is not None def get_api_resources(): diff --git a/server/app/scanpy_engine/labels.py b/server/app/scanpy_engine/labels.py index 1cdaeb42..7946f12e 100644 --- a/server/app/scanpy_engine/labels.py +++ b/server/app/scanpy_engine/labels.py @@ -17,7 +17,6 @@ def read_labels(fname): def write_labels(fname, df, header=None, backup_dir=None): if backup_dir is not None: backup(fname, backup_dir) - # rotate_fname(fname, backup_dir) if not df.empty: with open(fname, "w", newline="") as f: if header is not None: