Merge branch 'improve-wheel-and-sdist-generation'

* improve-wheel-and-sdist-generation:
  sdist: Fix source distribution including missing file. Fixes #11
  ci: Update scikit-ci to include fix for multiline support
  docs/make_a_release: Ensure uploaded distributions are signed
  travis: Add support for generating MacOSx wheels for Python 3.5. Fixes #7
  scikit-ci/circle/manylinux: Ensure tag is updated from linux to manylinux1

Author: jcfr

.circleci-matrix.yml

@@ -14,4 +14,4 @@ command:
   - |
     CI_ENV=`bash <(curl -s https://codecov.io/env)`
     DOCKER_ARGS="-e CI -e CIRCLECI -e MANYLINUX_PYTHON=$MANYLINUX_PYTHON -e GIRDER_TOKEN $CI_ENV"
-    dockcross -a "$DOCKER_ARGS" bash -c "/opt/python/${MANYLINUX_PYTHON}/bin/pip install scikit-ci==0.12.0 && /opt/python/${MANYLINUX_PYTHON}/bin/ci --clear-cached-env"
+    dockcross -a "$DOCKER_ARGS" bash -c "/opt/python/${MANYLINUX_PYTHON}/bin/pip install scikit-ci==0.13.0 && /opt/python/${MANYLINUX_PYTHON}/bin/ci --clear-cached-env"

.travis.yml

@@ -8,6 +8,11 @@ language: python
 matrix:
   include:
 
+    - os: osx
+      language: generic
+      env:
+        - PYTHONVERSION=3.5.2
+
     - os: osx
       language: generic
       env:
@@ -25,13 +30,14 @@ matrix:
 
 cache:
   directories:
+    - $HOME/.pyenv/versions/3.5.2
     - $HOME/.pyenv/versions/3.4.5
     - $HOME/.pyenv/versions/3.3.6
     - $HOME/.pyenv/versions/2.7.12
     - $HOME/downloads
 
 before_install:
-  - pip install scikit-ci==0.12.0 scikit-ci-addons==0.10.0
+  - pip install scikit-ci==0.13.0 scikit-ci-addons==0.10.0
   - ci_addons --install ../addons
 
 install:

MANIFEST.in

@@ -1,5 +1,7 @@
 include CMakeLists.txt
 include requirements-dev.txt
+include HISTORY.rst
+include README.rst
 
 recursive-include src *
 include versioneer.py

appveyor.yml

@@ -36,7 +36,7 @@ cache:
   - C:\\cmake-3.6.2
 
 init:
-  - python -m pip install scikit-ci==0.12.0 scikit-ci-addons==0.10.0
+  - python -m pip install scikit-ci==0.13.0 scikit-ci-addons==0.10.0
   - python -m ci_addons --install ../addons
 
   - ps: ../addons/appveyor/rolling-build.ps1

docs/make_a_release.rst

@@ -5,7 +5,7 @@ How to Make a Release
 A core developer should use the following steps to create a release of
 **cmake-python-distributions**.
 
-0. Configure `~/.pypirc` as described `here <http://peterdowns.com/posts/first-time-with-pypi.html>`_.
+0. Configure `~/.pypirc` as described `here <https://packaging.python.org/distributing/#uploading-your-project-to-pypi>`_.
 
 1. Make sure that all CI tests are passing: `AppVeyor <https://ci.appveyor.com/project/scikit-build/cmake-python-distributions-f3rbb>`_,
    `CircleCI <https://circleci.com/gh/scikit-build/cmake-python-distributions>`_
@@ -37,13 +37,13 @@ A core developer should use the following steps to create a release of
 
 4. Upload the packages to the testing PyPI instance::
 
-    twine upload -r pypitest dist/*
+    twine upload --sign -r pypitest dist/*
 
 5. Check the `PyPI testing package page <https://testpypi.python.org/pypi/cmake/>`_.
 
 6. Upload the packages to the PyPI instance::
 
-    twine upload dist/*
+    twine upload --sign dist/*
 
 7. Check the `PyPI package page <https://pypi.python.org/pypi/cmake/>`_.
 

scikit-ci.yml

@@ -39,6 +39,16 @@ build:
     - python setup.py --hide-listing sdist
     - $<RUN_ENV> python setup.py --hide-listing bdist_wheel
 
+  circle:
+    commands:
+      - |
+        # Since there are no external shared libraries to bundle into the wheels
+        # this step will fixup the wheel switching from 'linux' to 'manylinux1' tag
+        for whl in dist/*$(uname -p).whl; do
+            auditwheel repair $whl -w ./dist/
+            rm $whl
+        done
+
 test:
   commands:
     - python setup.py test