Merge branch 'develop'

CHANGELOG

@@ -1,3 +1,8 @@
+v0.4.2 (released July 30, 2015):
+
+- Fixed setup script not including header files in releases.
+- Fixed Windows binary uploads.
+
 v0.4.1 (released July 30, 2015):
 
 - The process for building Windows binaries has been fixed, and these should be

MANIFEST.in

@@ -1,2 +1,3 @@
 include LICENSE CHANGELOG
+recursive-include mwparserfromhell *.h
 recursive-include tests *.py *.mwtest

appveyor.yml

@@ -1,6 +1,6 @@
 # This config file is used by appveyor.com to build Windows release binaries
 
-version: 0.4.1-b{build}
+version: 0.4.2-b{build}
 
 branches:
   only:
@@ -14,6 +14,7 @@ environment:
     WRAPPER: "cmd /E:ON /V:ON /C .\\scripts\\win_wrapper.cmd"
     PIP:     "%WRAPPER% %PYTHON%\\Scripts\\pip.exe"
     SETUPPY: "%WRAPPER% %PYTHON%\\python setup.py --with-extension"
+    PYMOD:   "%WRAPPER% %PYTHON%\\python -m"
     PYPI_USERNAME: "earwigbot"
     PYPI_PASSWORD:
       secure: gOIcvPxSC2ujuhwOzwj3v8xjq3CCYd8keFWVnguLM+gcL0e02qshDHy7gwZZwj0+
@@ -56,7 +57,7 @@ after_test:
   - "%SETUPPY% bdist_wheel"
 
 on_success:
-  - "twine upload dist\\* -u %PYPI_USERNAME% -p %PYPI_PASSWORD%"
+  - "%PYMOD% twine upload dist\\* -u %PYPI_USERNAME% -p %PYPI_PASSWORD%"
 
 artifacts:
   - path: dist\*

docs/changelog.rst

@@ -1,6 +1,15 @@
 Changelog
 =========
 
+v0.4.2
+------
+
+`Released July 30, 2015 <https://github.com/earwig/mwparserfromhell/tree/v0.4.2>`_
+(`changes <https://github.com/earwig/mwparserfromhell/compare/v0.4.1...v0.4.2>`__):
+
+- Fixed setup script not including header files in releases.
+- Fixed Windows binary uploads.
+
 v0.4.1
 ------
 

mwparserfromhell/__init__.py

@@ -29,7 +29,7 @@ outrageously powerful parser for `MediaWiki <http://mediawiki.org>`_ wikicode.
 __author__ = "Ben Kurtovic"
 __copyright__ = "Copyright (C) 2012, 2013, 2014, 2015 Ben Kurtovic"
 __license__ = "MIT License"
-__version__ = "0.4.1"
+__version__ = "0.4.2"
 __email__ = "ben.kurtovic@gmail.com"
 
 from . import (compat, definitions, nodes, parser, smart_list, string_mixin,