diff --git a/dist/scadnano-0.9.2.tar.gz b/dist/scadnano-0.9.2.tar.gz new file mode 100644 index 00000000..a89bf187 Binary files /dev/null and b/dist/scadnano-0.9.2.tar.gz differ diff --git a/dist/scadnano-0.9.3.tar.gz b/dist/scadnano-0.9.3.tar.gz new file mode 100644 index 00000000..1563d5cb Binary files /dev/null and b/dist/scadnano-0.9.3.tar.gz differ diff --git a/scadnano/_version.py b/scadnano/_version.py index f78ca9a8..59a78d4c 100644 --- 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 index fc136faf..1f064f2e 100644 --- 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 index 907dfc40..3d32454d 100644 --- 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 index fd5d8dd2..e180d5a2 100644 --- 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 index b41270a6..46694d67 100644 --- 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 index db9cd2bd..5b4b8236 100644 --- 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 index c33f6377..77191d25 100644 --- 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]},