make more win builds, refinements

Author: mckaymatt

.travis.yml

@@ -71,35 +71,6 @@ matrix:
     - env: TARGET=x86_64-apple-darwin PYENV='3.6.1,3.5.3,3.4.6,2.7.13' WHEELPLATFORM=macosx_10_12_x86_64
       os: osx
       osx_image: xcode8.1
-    # - env: TARGET=i686-apple-darwin PYENV=2.7.13 WHEELPLATFORM=
-    #   os: osx
-    # - env: TARGET=i686-apple-darwin PYENV=3.6.1 WHEELPLATFORM=
-    #   os: osx
-
-    # # *BSD
-    # - env: TARGET=i686-unknown-freebsd DISABLE_TESTS=1 WHEELPLATFORM=
-    # - env: TARGET=x86_64-unknown-freebsd DISABLE_TESTS=1 WHEELPLATFORM=
-    # - env: TARGET=x86_64-unknown-netbsd DISABLE_TESTS=1 WHEELPLATFORM=
-
-    # # Other architectures
-    # - env: TARGET=aarch64-unknown-linux-gnu WHEELPLATFORM=
-    # - env: TARGET=armv7-unknown-linux-gnueabihf WHEELPLATFORM=
-    # - env: TARGET=mips-unknown-linux-gnu WHEELPLATFORM=
-    # - env: TARGET=mips64-unknown-linux-gnuabi64 WHEELPLATFORM=
-    # - env: TARGET=mips64el-unknown-linux-gnuabi64 WHEELPLATFORM=
-    # - env: TARGET=mipsel-unknown-linux-gnu WHEELPLATFORM=
-    # - env: TARGET=powerpc-unknown-linux-gnu WHEELPLATFORM=
-    # - env: TARGET=powerpc64-unknown-linux-gnu WHEELPLATFORM=
-    # - env: TARGET=powerpc64le-unknown-linux-gnu WHEELPLATFORM=
-    # - env: TARGET=s390x-unknown-linux-gnu DISABLE_TESTS=1 WHEELPLATFORM=
-
-    # # Testing other channels
-    # - env: TARGET=x86_64-unknown-linux-gnu WHEELPLATFORM=
-    #   rust: nightly
-    # - env: TARGET=x86_64-apple-darwin WHEELPLATFORM=
-    #   os: osx
-    #   rust: nightly
-
 
 before_install: set -e
 
@@ -139,8 +110,6 @@ deploy:
      # for such targets and that's generated using the stable channel
      condition: $TRAVIS_RUST_VERSION = stable
      tags: true
-   
-
 
 before_cache:
   # Travis can't cache files that are not readable by "others"
@@ -152,7 +121,6 @@ before_cache:
   - chmod -R a+r $HOME/.manylinux_rustup_cache
   - chmod -R a+r $HOME/.manylinux_cargo_cache
 
-
 cache:
   # There is a "cache: cargo" option but it's fails if target/ isn't in the build dir
   directories:
@@ -164,7 +132,6 @@ cache:
     - $HOME/.manylinux_rustup_cache
     - $HOME/.manylinux_cargo_cache
 
-
 branches:
   only:
     # release tags

HISTORY.rst

@@ -2,7 +2,7 @@
 History
 =======
 
-0.7.9 (2017-06-21)
+0.8.0 (2017-06-22)
 ------------------
 
 * First release on PyPI.

appveyor.yml

@@ -11,29 +11,47 @@ environment:
     TWINE_PASSWORD:
       secure: 4EVS6uB7j1M9/KmSzc8g/DGha3tRVlC0YuL5ugK16uE=
 
-  # TODO These are all the build jobs. Adjust as necessary. Comment out what you
-  # don't need
   matrix:
     # MinGW
     # - TARGET: i686-pc-windows-gnu
     # - TARGET: x86_64-pc-windows-gnu
 
     # MSVC
+    # 2.7
     - TARGET: i686-pc-windows-msvc
       PYTHON_DIR: "C:\\Python27"
       WHEELPLATFORM: win32
-
     - TARGET: x86_64-pc-windows-msvc
       PYTHON_DIR: "C:\\Python27-x64"
       WHEELPLATFORM: win_amd64
-
+    # 3.6
+    - TARGET: i686-pc-windows-msvc
+      PYTHON_DIR: "C:\\Python36"
+      WHEELPLATFORM: win32
+    - TARGET: x86_64-pc-windows-msvc
+      PYTHON_DIR: "C:\\Python36-x64"
+      WHEELPLATFORM: win_amd64
+    # 3.5
     - TARGET: i686-pc-windows-msvc
       PYTHON_DIR: "C:\\Python35"
       WHEELPLATFORM: win32
-
     - TARGET: x86_64-pc-windows-msvc
       PYTHON_DIR: "C:\\Python35-x64"
       WHEELPLATFORM: win_amd64
+    # 3.4
+    - TARGET: i686-pc-windows-msvc
+      PYTHON_DIR: "C:\\Python34"
+      WHEELPLATFORM: win32
+    - TARGET: x86_64-pc-windows-msvc
+      PYTHON_DIR: "C:\\Python34-x64"
+      WHEELPLATFORM: win_amd64
+    # 3.3
+    - TARGET: i686-pc-windows-msvc
+      PYTHON_DIR: "C:\\Python33"
+      WHEELPLATFORM: win32
+    - TARGET: x86_64-pc-windows-msvc
+      PYTHON_DIR: "C:\\Python33-x64"
+      WHEELPLATFORM: win_amd64
 
 
     # Testing other channels
@@ -98,7 +116,7 @@ deploy:
       appveyor_repo_tag: true
 
 cache:
-  - C:\Users\appveyor\.cargo\registry
+  - C:\Users\appveyor\.rustup
 
 branches:
   only:

requirements_dev.txt

@@ -10,6 +10,5 @@ Sphinx>=1.4.8
 pytest>=2.9.2
 pytest-runner>=2.0
 Click>=6.0
-twine
-
--e git://github.com/PyO3/setuptools-rust.git@706c499a1a390ab2d175d5b44116ea5cd8097bb2#egg=setuptools_rust
+twine>=1.9.1
+setuptools-rust>=0.6.0

setup.cfg

@@ -19,6 +19,8 @@ replace = {new_version}
 search = {current_version}
 replace = {new_version}
 
+
+
 [flake8]
 exclude = docs
 
@@ -27,5 +29,6 @@ test = pytest
 
 [tool:pytest]
 testpaths = tests
-addopts = --verbose
 
+
+addopts = --verbose