From dcb8d23d31c739203c7a96ddf372653ecedb0e02 Mon Sep 17 00:00:00 2001
From: Constantin Pape <constantin.pape@iwr.uni-heidelberg.de>
Date: Mon, 3 Jun 2019 21:41:43 +0200
Subject: [PATCH] Add conda env file
---
environment.yaml | 2 ++
master.py | 13 +++++++++----
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/environment.yaml b/environment.yaml
index f055999..fa70090 100644
--- a/environment.yaml
+++ b/environment.yaml
@@ -4,9 +4,11 @@ channels:
- cpape
- conda-forge
dependencies:
+ - affogato
- scikit-image
- luigi
- nifty
- vigra
- h5py
- z5py
+ - cluster_tools
diff --git a/master.py b/master.py
index 0584728..a0be254 100644
--- a/master.py
+++ b/master.py
@@ -17,8 +17,10 @@ def get_tags():
# TODO do we need more sub-folders ?
def make_folder_structure(tag):
- new_tables_folder = os.path.join('data', tag, 'tables')
+ new_folder = os.makedirs('data', tag)
+ new_tables_folder = os.path.join(new_folder, 'tables')
os.makedirs(new_tables_folder)
+ return new_folder
# TODO
@@ -40,13 +42,15 @@ def make_attributes(input_path, input_key, output_path):
# TODO check for errors
def make_release(tag):
- call(['git', 'commit', '-m', 'Automatice platybrowser data update'])
+ call(['git', 'commit', '-m', 'Automatic platybrowser update'])
call(['git', 'tag', tag])
# TODO autopush ???
- # call(['git', 'push', 'origin', '--tags'])
+ # call(['git', 'push', 'origin', 'master', '--tags'])
+# TODO catch all exceptions and re-roll if exception was caught
# TODO what arguments do we expose
+# TODO need to deal with different kinds of segmentations
def master():
""" Generate new version of platy-browser derived data.
@@ -59,7 +63,8 @@ def master():
tag, new_tag = get_tags()
# make new folder structure
- make_folder_structure(new_tag)
+ folder = os.path.join('data', tag)
+ new_folder = make_folder_structure(new_tag)
# TODO
# Need to check if we actually need to export the new segmentation
--
GitLab