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

Dev

scadnano/scadnano.py

@@ -296,7 +296,7 @@ class Grid(str, enum.Enum):
 # import scadnano_version
 # current_version: str = scadnano_version.current_version
 # initial_version: str = scadnano_version.initial_version
-current_version: str = "0.7.3"
+current_version: str = "0.7.4"
 initial_version: str = "0.0.1"
 
 default_idt_scale = "25nm"
@@ -307,8 +307,6 @@ def default_major_tick_distance(grid: Grid) -> int:
     return 7 if grid in (Grid.hex, Grid.honeycomb) else 8
 
 
-default_grid: Grid = Grid.none
-
 default_helix_rotation: float = 0.0
 default_helix_rotation_anchor: int = 0
 
@@ -2767,8 +2765,8 @@ def assign_m13_to_scaffold(self, rotation: int = 5588, variant: M13Variant = M13
     def to_json_serializable(self, suppress_indent: bool = True):
         dct = OrderedDict()
         dct[version_key] = current_version
-        if self.grid != default_grid:
-            dct[grid_key] = str(self.grid)[5:]  # remove prefix 'Grid.'
+        dct[grid_key] = str(self.grid)[5:]  # remove prefix 'Grid.'
+
         if self.major_tick_distance >= 0 and (
                 self.major_tick_distance != default_major_tick_distance(self.grid)):
             dct[major_tick_distance_key] = self.major_tick_distance

scadnano/scadnano_version.py

@@ -1,2 +1,2 @@
-current_version = "0.7.3"
+current_version = "0.7.4"
 initial_version = "0.0.1"

setup.py

@@ -24,7 +24,7 @@
 setup(name='scadnano',
       packages=['scadnano'],
       # version=sv.current_version,
-      version='0.7.3',
+      version='0.7.4',
       # download_url=f'https://github.com/UC-Davis-molecular-computing/scadnano-python-package/archive/v{sv.current_version}.zip',
       download_url=f'https://github.com/UC-Davis-molecular-computing/scadnano-python-package/archive/v0.7.0.zip',
       license='MIT',