summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile14
-rw-r--r--howto.txt12
-rw-r--r--requirements.txt3
-rw-r--r--tox_wheels.ini11
4 files changed, 28 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index 8ba17dfa..d141f3b5 100644
--- a/Makefile
+++ b/Makefile
@@ -48,15 +48,17 @@ metahtml:
# Kitting
-# For kitting on Windows:
-# SDIST_CMD = python setup.py sdist --keep-temp --formats=gztar fixtar --owner=ned --group=coverage --clean
-SDIST_CMD = python setup.py sdist --formats=gztar
-
kit:
- $(SDIST_CMD)
+ python setup.py sdist --formats=gztar,zip
+
+wheel:
+ tox -c tox_wheels.ini
kit_upload:
- $(SDIST_CMD) upload
+ twine upload dist/*
+
+winkit:
+ tox -c tox_winkits.ini
kit_local:
cp -v dist/* `awk -F "=" '/find-links/ {print $$2}' ~/.pip/pip.conf`
diff --git a/howto.txt b/howto.txt
index b191c643..2002da1a 100644
--- a/howto.txt
+++ b/howto.txt
@@ -39,12 +39,12 @@
- $ tox -c tox_winkits.ini
- Update PyPi:
- $ make pypi
- - upload the kits:
- - SWITCH TO TWINE: https://pypi.python.org/pypi/twine
- - $ make kit_upload
- - $ tox -c tox_winkits.ini upload
- # note: this seems to try to upload each file twice, so you'll have a
- # successful upload, then a failure, but the file gets there.
+ - upload source kits:
+ - $ make kit kit_upload
+ - upload wheels (for each platform):
+ - $ make wheel kit_upload
+ - upload windows kits:
+ - $ make winkit kit_upload
- Visit http://pypi.python.org/pypi?%3Aaction=pkg_edit&name=coverage :
- show/hide the proper versions.
- Tag the tree
diff --git a/requirements.txt b/requirements.txt
index c02502da..701e9962 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,3 +4,6 @@ mock
PyContracts
pylint
tox >= 1.9
+
+# and for kitting...
+twine
diff --git a/tox_wheels.ini b/tox_wheels.ini
new file mode 100644
index 00000000..378cc0bd
--- /dev/null
+++ b/tox_wheels.ini
@@ -0,0 +1,11 @@
+[tox]
+envlist = py26, py27, py33, py34, py35
+toxworkdir = {toxinidir}/.tox_kits
+
+[testenv]
+commands =
+ {envpython} setup.py bdist_wheel {posargs}
+
+deps =
+ wheel
+ setuptools >= 6.0.0