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

Dev

doc/conf.py

@@ -24,8 +24,7 @@
 # from scadnano.scadnano_version import current_version
 # this is ugly, but appears to be standard practice:
 # https://stackoverflow.com/questions/17583443/what-is-the-correct-way-to-share-package-version-with-setup-py-and-the-package/17626524#17626524
-# __version__ = open("scadnano/_version.py").readlines()[-1].split()[-1].strip("\"'")
-
+# __version__ = open("../scadnano/_version.py").readlines()[-1].split()[-1].strip("\"'")
 
 # this is ugly, but appears to be standard practice:
 # https://stackoverflow.com/questions/17583443/what-is-the-correct-way-to-share-package-version-with-setup-py-and-the-package/17626524#17626524
@@ -46,7 +45,6 @@ def extract_version(filename: str):
 __version__ = extract_version('../scadnano/scadnano.py')
 
 
-
 # Type "make html" at the command line to generate the documentation.
 
 

scadnano/scadnano.py

@@ -44,6 +44,8 @@
 # commented out for now to support Python 3.6, which does not support this feature
 # from __future__ import annotations
 
+__version__ = "0.10.3" # version line; WARNING: do not remove or change this line or comment
+
 import dataclasses
 from abc import abstractmethod, ABC
 import json
@@ -57,7 +59,6 @@
 import sys
 import os.path
 
-__version__ = "0.10.2" # version line; WARNING: do not remove or change this line or comment
 
 default_scadnano_file_extension = 'sc'
 

setup.py

@@ -22,7 +22,7 @@ def extract_version(filename: str):
         lines = f.readlines()
     version_comment = '# version line; WARNING: do not remove or change this line or comment'
     for line in lines:
-        if line.endswith(version_comment):
+        if version_comment in line:
             idx = line.index(version_comment)
             line_prefix = line[:idx]
             parts = line_prefix.split('=')