Merge pull request #97 from UC-Davis-molecular-computing/dev

bumped version from 0.9.2 to 0.9.3
UC-Davis-molecular-computing · Jun 28, 2020 · 9b32874 · 9b32874
2 parents 17677d9 + c4db84a
commit 9b32874
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 15 deletions.
diff --git a/dist/scadnano-0.9.2.tar.gz b/dist/scadnano-0.9.2.tar.gz
diff --git a/dist/scadnano-0.9.3.tar.gz b/dist/scadnano-0.9.3.tar.gz
diff --git a/scadnano/_version.py b/scadnano/_version.py
@@ -2,4 +2,5 @@
 # taken from https://stackoverflow.com/questions/17583443/what-is-the-correct-way-to-share-package-version-with-setup-py-and-the-package/17626524#17626524
 
 # The following line *must* be the last in the module, exactly as formatted:
-__version__ = "0.9.2"
+# XXX: REMEMBER TO CHANGE VERSION IN scadnano.py also, for users who do not install from PyPI
+__version__ = "0.9.3"
diff --git a/scadnano/scadnano.py b/scadnano/scadnano.py
@@ -56,6 +56,15 @@
 import sys
 import os.path
 
+# Don't really understand why, but an explicit import solves the issue described here
+# https://stackoverflow.com/a/39131141
+# solves the build problems: https://github.com/UC-Davis-molecular-computing/scadnano-python-package/actions/runs/125490116
+try:
+    from ._version import __version__
+except ImportError:
+    # this is so scadnano.py file works without _version.py being present, in case user downloads it
+    __version__ = "0.9.3"
+
 StrandLabel = TypeVar('StrandLabel')
 DomainLabel = TypeVar('DomainLabel')
 
@@ -324,15 +333,6 @@ class Grid(str, enum.Enum):
 ##########################################################################
 # constants
 
-# Don't really understand why, but an explicit import solves the issue described here
-# https://stackoverflow.com/a/39131141
-# solves the build problems: https://github.com/UC-Davis-molecular-computing/scadnano-python-package/actions/runs/125490116
-try:
-    from ._version import __version__
-except ImportError:
-    # this is so scadnano.py file works without _version.py being present, in case user downloads it
-    __version__ = "0.9.2"
-
 default_idt_scale = "25nm"
 default_idt_purification = "STD"
 

diff --git a/tests_inputs/cadnano_v2_export/test_16_helix_origami_rectangle_no_twist.dna b/tests_inputs/cadnano_v2_export/test_16_helix_origami_rectangle_no_twist.dna
@@ -1,5 +1,5 @@
 {
-  "version": "0.9.1",
+  "version": "0.9.3",
   "grid": "square",
   "helices": [
     {"max_offset": 448, "grid_position": [0, 0]},

diff --git a/tests_inputs/cadnano_v2_export/test_2_stape_2_helix_origami_deletions_insertions.dna b/tests_inputs/cadnano_v2_export/test_2_stape_2_helix_origami_deletions_insertions.dna
@@ -1,5 +1,5 @@
 {
-  "version": "0.9.1",
+  "version": "0.9.3",
   "grid": "square",
   "helices": [
     {"grid_position": [0, 0]},

diff --git a/tests_inputs/cadnano_v2_export/test_2_stape_2_helix_origami_extremely_simple.dna b/tests_inputs/cadnano_v2_export/test_2_stape_2_helix_origami_extremely_simple.dna
@@ -1,5 +1,5 @@
 {
-  "version": "0.9.1",
+  "version": "0.9.3",
   "grid": "square",
   "helices": [
     {"grid_position": [0, 0]},

diff --git a/tests_inputs/cadnano_v2_export/test_2_stape_2_helix_origami_extremely_simple_2.dna b/tests_inputs/cadnano_v2_export/test_2_stape_2_helix_origami_extremely_simple_2.dna
@@ -1,5 +1,5 @@
 {
-  "version": "0.9.1",
+  "version": "0.9.3",
   "grid": "square",
   "helices": [
     {"grid_position": [0, 0]},

diff --git a/tests_inputs/cadnano_v2_export/test_6_helix_origami_rectangle.dna b/tests_inputs/cadnano_v2_export/test_6_helix_origami_rectangle.dna
@@ -1,5 +1,5 @@
 {
-  "version": "0.9.1",
+  "version": "0.9.3",
   "grid": "square",
   "helices": [
     {"max_offset": 192, "grid_position": [0, 0]},