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

fixed documentation

doc/conf.py

@@ -16,7 +16,7 @@
 import os
 import sys
 
-import scadnano
+# import scadnano
 
 sys.path.insert(0, os.path.abspath('../scadnano'))
 # print(sys.path)
@@ -31,10 +31,10 @@
 author = 'David Doty'
 
 # The full version, including alpha/beta/rc tags
-# version = '0.7.0'
-# release = '0.7.0'
-version = scadnano.current_version
-release = scadnano.current_version
+version = '0.7.0'
+release = '0.7.0'
+# version = scadnano.current_version
+# release = scadnano.current_version
 
 # -- General configuration ---------------------------------------------------
 

setup.py

@@ -10,7 +10,7 @@
 
 from setuptools import setup, find_packages
 
-import scadnano
+# import scadnano
 
 # read the contents of your README file
 from os import path
@@ -21,15 +21,15 @@
 
 setup(name='scadnano',
       packages=['scadnano'],
-      version=scadnano.current_version,
-      # version='0.7.0',
+      # version=scadnano.current_version,
+      version='0.7.0',
+      # download_url=f'https://github.com/UC-Davis-molecular-computing/scadnano-python-package/archive/v{scadnano.current_version}.zip',
+      download_url=f'https://github.com/UC-Davis-molecular-computing/scadnano-python-package/archive/v0.7.0.zip',
       license='MIT',
       description="Python scripting library for generating designs readable by scadnano.",
       author="David Doty",
       author_email="doty@ucdavis.edu",
       url="https://github.com/UC-Davis-molecular-computing/scadnano-python-package",
-      download_url=f'https://github.com/UC-Davis-molecular-computing/scadnano-python-package/archive/v{scadnano.current_version}.zip',
-      # download_url=f'https://github.com/UC-Davis-molecular-computing/scadnano-python-package/archive/v0.7.0.zip',
       long_description=long_description,
       long_description_content_type='text/markdown; variant=GFM',
       requires=['xlwt']