Merge pull request travitch#81 from SRI-CSL/master

Keeping in sync

Author: ianamason

Makefile

@@ -26,14 +26,18 @@ develop:
 
 
 dist: clean
-	python setup.py bdist_wheel
+	python3 setup.py sdist bdist_wheel
 
 # If you need to push this project again,
 # INCREASE the version number in wllvm/version.py,
 # otherwise the server will give you an error.
 
-publish: dist
-	python setup.py sdist upload
+#publish: dist
+#	python setup.py sdist upload
+
+publish:
+	python3 -m twine upload dist/*
+
 
 install:
 	pip install

README.md

@@ -1,5 +1,5 @@
 ![WLLVM](img/dragon128x128.png?raw_true)Whole Program LLVM
-==================
+
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 [![PyPI version](https://badge.fury.io/py/wllvm.svg)](https://badge.fury.io/py/wllvm)
 [![Build Status](https://travis-ci.org/SRI-CSL/whole-program-llvm.svg?branch=master)](https://travis-ci.org/SRI-CSL/whole-program-llvm)

wllvm/version.py

@@ -70,7 +70,11 @@
 
 1.2.3    - 4/15/2019 The tax day version. Almost a years worth of tweaks from building large things like the Linux kernel.
 
+1.2.4    - 4/15/2019 The tax day version, II. Testing the twine upload.
+
+1.2.5    - 4/17/2019 Fixing the pip package, hopefully.
+
 """
 
-wllvm_version = '1.2.3'
-wllvm_date = 'April 15 2019'
+wllvm_version = '1.2.5'
+wllvm_date = 'April 17 2019'