updates for python version 0.30.0a0 (#2212)

* fix python Makefile for prereleases

* setup should fail when pypandoc not installed

* bump python version

* removed pandoc requirement

adam-python/Makefile

@@ -20,12 +20,12 @@ define help
 
 Supported targets: prepare, develop, sdist, clean, test, and pypi.
 
-Please note that all build targets require a virtualenv to be active. 
+Please note that all build targets require a virtualenv to be active.
 
 The 'prepare' target installs ADAM's build requirements into the current virtualenv.
 
-The 'develop' target creates an editable install of ADAM and its runtime requirements in the 
-current virtualenv. The install is called 'editable' because changes to the source code 
+The 'develop' target creates an editable install of ADAM and its runtime requirements in the
+current virtualenv. The install is called 'editable' because changes to the source code
 immediately affect the virtualenv. This target also builds a .egg.
 
 The 'clean' target undoes the effect of 'develop'.
@@ -86,15 +86,12 @@ test: check_build_reqs
 
 pypi: check_clean_working_copy
 	set -x \
-	&& tag_build=`$(python) -c 'pass;\
-	    from version import version as v;\
-	    from pkg_resources import parse_version as pv;\
-	    import os;\
-	    print "--tag-build=.dev" + os.getenv("BUILD_NUMBER") if pv(v).is_prerelease else ""'` \
-	&& $(python) setup.py egg_info $$tag_build sdist bdist_egg upload
+	&& $(python) setup.py egg_info sdist bdist_egg \
+	&& twine check dist/* \
+	&& twine upload dist/*
 clean_pypi:
 	- rm -rf build/
-
+	- rm -rf dist/
 
 clean: clean_develop clean_pypi
 

adam-python/setup.py

@@ -91,20 +91,15 @@
     # bdgenomics.adam will search for ADAM_HOME with Python.
     scripts.append("bdgenomics/adam/find_adam_home.py")
 
-    long_description = "!!!!! missing pandoc do not upload to PyPI !!!!"
-    try:
-        import pypandoc
-        long_description = pypandoc.convert('README.md', 'rst')
-    except ImportError:
-        print("Could not import pypandoc - required to package bdgenomics.adam", file=sys.stderr)
-    except OSError:
-        print("Could not convert - pandoc is not installed", file=sys.stderr)
+    with open("README.md", "r") as fh:
+        long_description = fh.read()
 
     setup(
         name='bdgenomics.adam',
         version=adam_version,
         description='A fast, scalable genome analysis system',
         long_description=long_description,
+        long_description_content_type='text/markdown',
         author='Big Data Genomics',
         author_email='adam-developers@googlegroups.com',
         url="https://github.com/bdgenomics/adam",
@@ -133,4 +128,3 @@
         os.rmdir(JARS_TARGET)
         os.remove(SCRIPTS_TARGET)
         os.rmdir(TEMP_PATH)
-

adam-python/version.py

@@ -18,7 +18,7 @@
 
 from __future__ import print_function
 
-version = '0.28.0a0'
+version = '0.30.0a0'
 
 if __name__ == '__main__':
     print(version)