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

bumped version number to 0.6.5, fixed #46, fixed #23
UC-Davis-molecular-computing · May 22, 2020 · 28fa970 · 28fa970
2 parents 6d0d034 + 3113cb9
commit 28fa970
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 3 deletions.
diff --git a/dist/scadnano-0.6.0.tar.gz b/dist/scadnano-0.6.0.tar.gz
diff --git a/dist/scadnano-0.6.1.tar.gz b/dist/scadnano-0.6.1.tar.gz
diff --git a/dist/scadnano-0.6.2.tar.gz b/dist/scadnano-0.6.2.tar.gz
diff --git a/dist/scadnano-0.6.3.tar.gz b/dist/scadnano-0.6.3.tar.gz
diff --git a/dist/scadnano-0.6.4.tar.gz b/dist/scadnano-0.6.4.tar.gz
diff --git a/dist/scadnano-0.6.5.tar.gz b/dist/scadnano-0.6.5.tar.gz
diff --git a/scadnano/scadnano.py b/scadnano/scadnano.py
@@ -291,7 +291,7 @@ class Grid(str, enum.Enum):
 ##########################################################################
 # constants
 
-current_version: str = "0.6.0"
+current_version: str = "0.6.5"
 initial_version: str = "0.1.0"
 
 default_idt_scale = "25nm"

diff --git a/setup.py b/setup.py
@@ -1,6 +1,14 @@
 #!/usr/bin/env python
 
-from distutils.core import setup
+# from distutils.core import setup
+
+# got some ideas from here: https://medium.com/@joel.barmettler/how-to-upload-your-python-package-to-pypi-65edc5fe9c56
+#
+# But apparently setuptools is the replacement for distutils, and distutils was causing problems such as
+# not including the README.md file and not formatting it as Markdown on PyPI
+# https://setuptools.readthedocs.io/en/latest/setuptools.html
+
+from setuptools import setup, find_packages
 
 import scadnano
 
@@ -20,5 +28,6 @@
       url="https://github.com/UC-Davis-molecular-computing/scadnano-python-package",
       download_url = 'https://github.com/UC-Davis-molecular-computing/scadnano-python-package/archive/v0.1.0.zip',
       long_description = long_description,
-      long_description_content_type = 'text/markdown', requires=['xlwt']
+      long_description_content_type = 'text/markdown; variant=GFM',
+      requires=['xlwt']
       )