Merge pull request #58 from EliLillyCo/hotfix/setup_bugs

hotfix release 1.1 as 1.1.1

.travis.yml

@@ -23,6 +23,7 @@ before_script:
 - export CROMWELL_JAR=/tmp/cromwell-45.jar
 script:
 - make test
+- make test_release_setup
 after_success:
 - bash <(curl -s https://codecov.io/bash)
 deploy:

CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+## v1.1.1 (2019.09.27)
+
+* Fixes `license` entry in `setup.py` for proper rendering to release to PyPI.
+
 ## v1.1 (2019.09.26)
 
 * Add ability to create executor plugins

Makefile

@@ -7,12 +7,15 @@ tests = tests
 pytestopts = -s -vv --show-capture=all
 #pytestopts = -s -vv --show-capture=all -m "not integration"
 
-all: clean install install_extras test
+all: clean install install_extras install_development_requirements test test_release_setup
 
 install: clean
 	python setup.py bdist_wheel
 	pip install --upgrade dist/*.whl $(installargs)
 
+install_development_requirements:
+	pip install -r requirements.txt
+
 install_extras:
 	pip install .[all]
 
@@ -21,6 +24,9 @@ test:
 	coverage report -m
 	coverage xml
 
+test_release_setup:
+	twine check dist/*
+
 lint:
 	flake8 $(package)
 

requirements.txt

@@ -4,4 +4,6 @@ pysam
 pytest>=5.1
 pytest-subtests
 subby>=0.1.6
-xphyle>=4.1.2
+xphyle>=4.1.2
+readme_renderer>=24.0
+twine>=2.0.0

setup.py

@@ -34,14 +34,7 @@
         "rb",
         "utf-8"
     ).read(),
-    license=codecs.open(
-        os.path.join(
-            os.path.dirname(os.path.realpath(__file__)),
-            "LICENSE"
-        ),
-        "rb",
-        "utf-8"
-    ).read(),
+    license="Apache License 2.0",
     use_scm_version=True,
     setup_requires=["setuptools_scm"],
     entry_points={