Enable example download & Version 1.0.8 (#380)

* Enable example download * Set to next strandesign package * Bump to version 1.0.8
cnapy-org · Jun 7, 2022 · ffd4def · ffd4def
1 parent 6648d22
commit ffd4def
Show file tree

Hide file tree

Showing 13 changed files with 32 additions and 26 deletions.
diff --git a/README.md b/README.md
@@ -45,12 +45,12 @@ We use conda as package manager to install CNApy. You can use [miniconda](https:
 
 3. Create a conda environment with all dependencies
     ```sh
-    conda create -n cnapy-1.0.7 -c conda-forge -c cnapy cnapy=1.0.7
+    conda create -n cnapy-1.0.8 -c conda-forge -c cnapy cnapy=1.0.8
     ```
 
 4. Activate the cnapy conda environment
     ```sh
-    conda activate cnapy-1.0.7
+    conda activate cnapy-1.0.8
     ```
 
 5. Run CNApy

diff --git a/cnapy/appdata.py b/cnapy/appdata.py
@@ -19,7 +19,7 @@ class AppData:
     ''' The application data '''
 
     def __init__(self):
-        self.version = "cnapy-1.0.7"
+        self.version = "cnapy-1.0.8"
         self.format_version = 1
         self.unsaved = False
         self.project = ProjectData()

diff --git a/cnapy/gui_elements/download_dialog.py b/cnapy/gui_elements/download_dialog.py
@@ -22,16 +22,16 @@ def __init__(self, appdata: AppData):
 
         label_line = QVBoxLayout()
         label = QLabel(
-            "CNApy could not find a projects directory.")
-        label_line.addWidget(label)
-        label = QLabel(
-            "Should CNApy create a projects directory and download example projects?")
+            "Should CNApy download the CNApy example projects to your configured CNApy projects directory?\n"
+            "If you didn't set a working directory yet, you can do it unter 'Config->Configure CNApy'.\n"
+            "Note: You can always change the projects directory in CNApy's configuration."
+        )
         label_line.addWidget(label)
         self.layout.addItem(label_line)
 
         button_line = QHBoxLayout()
-        self.download_btn = QPushButton("Yes, create directory")
-        self.close = QPushButton("No, skip")
+        self.download_btn = QPushButton("Yes, download examples")
+        self.close = QPushButton("No, close")
         button_line.addWidget(self.download_btn)
         button_line.addWidget(self.close)
         self.layout.addItem(button_line)
@@ -43,8 +43,9 @@ def __init__(self, appdata: AppData):
 
     def download(self):
         work_directory = self.appdata.work_directory
-        print("Create work directory:", work_directory)
-        os.mkdir(work_directory)
+        if not os.path.exists(work_directory):
+            print("Create uncreated work directory:", work_directory)
+            os.mkdir(work_directory)
 
         targets = ["all_cnapy_projects.zip"]
         for t in targets:

diff --git a/cnapy/gui_elements/main_window.py b/cnapy/gui_elements/main_window.py
@@ -96,6 +96,10 @@ def __init__(self, appdata: AppData):
         self.file_menu.addAction(export_sbml_action)
         export_sbml_action.triggered.connect(self.export_sbml)
 
+        download_examples = QAction("Download CNApy example projects...", self)
+        self.file_menu.addAction(download_examples)
+        download_examples.triggered.connect(self.download_examples)
+
         exit_action = QAction("Exit", self)
         exit_action.setShortcut("Ctrl+Q")
         self.file_menu.addAction(exit_action)
@@ -564,10 +568,6 @@ def show_config_dialog(self):
         dialog = ConfigDialog(self.appdata)
         dialog.exec_()
 
-    def show_download_dialog(self):
-        dialog = DownloadDialog(self.appdata)
-        dialog.exec_()
-
     @Slot()
     def show_config_cobrapy_dialog(self):
         dialog = ConfigCobrapyDialog(self.appdata)
@@ -605,6 +605,11 @@ def export_sbml(self):
 
         self.setCursor(Qt.ArrowCursor)
 
+    @Slot()
+    def download_examples(self):
+        dialog = DownloadDialog(self.appdata)
+        dialog.exec_()
+
     @Slot()
     def load_box_positions(self):
         dialog = QFileDialog(self)

diff --git a/constructor/linux/construct.yaml b/constructor/linux/construct.yaml
@@ -1,5 +1,5 @@
 name: CNApy
-version: 1.0.7
+version: 1.0.8
 
 ignore_duplicate_files: True
 

diff --git a/constructor/win/README.md b/constructor/win/README.md
@@ -24,12 +24,12 @@ We use conda as package manager to install CNApy. You can use [miniconda](https:
 
 1. Create a conda environment with all dependencies
     ```sh
-    conda create -n cnapy-1.0.7 -c conda-forge -c cnapy cnapy=1.0.7
+    conda create -n cnapy-1.0.8 -c conda-forge -c cnapy cnapy=1.0.8
     ```
 
 2. Activate the cnapy conda environment
     ```
-    conda activate cnapy-1.0.7
+    conda activate cnapy-1.0.8
     ```
 
 3. Run CNApy

diff --git a/constructor/win/construct.yaml b/constructor/win/construct.yaml
@@ -1,5 +1,5 @@
 name: CNApy
-version: 1.0.7
+version: 1.0.8
 
 ignore_duplicate_files: True
 
@@ -10,7 +10,7 @@ channels:
 
 specs:
   - conda
-  # - cnapy=1.0.7
+  # - cnapy=1.0.8
   - mamba
   - pip
   - python=3.8

diff --git a/constructor/win/post_install.bat b/constructor/win/post_install.bat
@@ -1,5 +1,5 @@
 call %~dp0..\Scripts\activate.bat
 
-call mamba install cnapy=1.0.7 -c cnapy -c conda-forge -v --yes
+call mamba install cnapy=1.0.8 -c cnapy -c conda-forge -v --yes
 call pause
 call %~dp0..\Scripts\conda clean --all --yes
diff --git a/environment.yml b/environment.yml
@@ -22,6 +22,6 @@ dependencies:
   - psutil=5.9
   - efmtool_link=0.0.4
   - optlang_enumerator=0.0.7
-  - straindesign=1.2
+  - straindesign=1.3
   - gurobi
   - cplex
diff --git a/recipes/linux/meta.yaml b/recipes/linux/meta.yaml
@@ -1,4 +1,4 @@
-{% set version = '1.0.7' %}
+{% set version = '1.0.8' %}
 
 package:
   name: cnapy

diff --git a/recipes/noarch/meta.yaml b/recipes/noarch/meta.yaml
@@ -1,4 +1,4 @@
-{% set version = '1.0.7' %}
+{% set version = '1.0.8' %}
 
 package:
   name: cnapy

diff --git a/recipes/win/meta.yaml b/recipes/win/meta.yaml
@@ -1,4 +1,4 @@
-{% set version = '1.0.7' %}
+{% set version = '1.0.8' %}
 
 package:
   name: cnapy

diff --git a/setup.py b/setup.py
@@ -18,7 +18,7 @@
 
 setup(
     name='cnapy',
-    version='1.0.7',
+    version='1.0.8',
     url='https://github.com/cnapy-org/CNApy/',
     license='GPLv3+',
     description='An integrated environment for metabolic network analysis.',