Merge branch 'master' into develop

whtsky · whtsky · commit 233629c78b8a · 2016-08-01T23:29:46.000+08:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,20 +1,24 @@
 os: osx
 language: generic
 env:
-  - VERSION=2.7
-  - VERSION=3.3
-  - VERSION=3.4
-  - VERSION=3.5
-
+  global:
+    - secure: "R5OivfMMAw1BhdwbBjEjfxhkqtj+Ntqf+jh+05Mr3y1aV8tC9J1vsq213Q7J7teweJ7WteHSj8ymJk2DdJ5mOIFEPAWQeuUIzcaplmfmsxYNdUhj19Ok8E8XG+ppBHccDaS3eE6GM6tDB9PouOE0MGA8/j9DLHXDSPTrjO/+G+AQ7V9M2+XqiEHJrPhlzas1h37XKLa5EzMIMK3atoUS1CLg6JOa+Rgz9OfXs+wQyErdQ5BjNfzZH4BKFhHl1zBViPv+j3SHDkyFw92mbXx14qn8xiyY3ZtKisMKT/X5o8DUJbWN3OdFF65NQq5lcnTFjIx06LJmy+zLjnZ83qggRuRPxAV2D9ODRBjDY3bdBMVSeaP/0yKldZyd14UXU3Ahwymi9lHC+MRgzRx5VyovptgOq3RfZ97peRT0NRDuotcxG1oFcAOIutH7oQZiAWZV7LLSSc3JdNCbwjRDm0MqzoD4TcMa8vCJMEZWSzLLygJYiZC0OklTnOYko5wdYms8aJw1FPjXbc2UNo6bVXXnbdoxEfadxtWKskNKF6tSdl766CMh/jM3gMv2bZkY2mYSnNp1RL1sslE33BZPgzW5fyFnUBskwQZEOidWx+uQ1eiPsnvb5FBC8on59fTVKkHh6Xiffqltq8Yvy33P12qoV+S9GHMT4DOm9bQf/qob2fQ="
+  matrix:
+    - VERSION=2.7
+    - VERSION=3.3
+    - VERSION=3.4
+    - VERSION=3.5
 matrix:
   include:
     - sudo: required
       os: linux
+      language: python
       services:
         - docker
       env: DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
     - sudo: required
       os: linux
+      language: python
       services:
         - docker
       env: DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
@@ -30,15 +34,4 @@ script:
 
 after_success:
   - ls wheelhouse/
-  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then bash <(curl -s https://codecov.io/bash); fi
-
-deploy:
-  provider: releases
-  api_key:
-    secure: PQSvEpo4Ec3u52FflZsc4M+RLGpToh3w6ej+XwEYKaSsfdXSAA936gXx7BWYy0rZrPT3RFfUjb63wGTfM3sf54cbvVMViPd/7L3DnYPaSsO1lCKdHPkcXV9tXHcWjDw7o0E9dviWXcpptR4Z7z73pE4yYY06e+SzBpROpiWSl9fB62I+DkIvBtfKjcLkvsSf86gtuysTw+v5aeqWtusHuRETI2/mtYwKu3ERICWzWzn9kWL4EWf+2y9uXFa8oz7faUsdK1uxc9xDMJLXtIErg71+Lg0s2KqduOmmGSB03APxMe0/4sh8+Do9yEdh677VGV4KbY5qzeKffjXEFp7Wj7ZG+w1WsmnxTHKiuFdJRbswuSHZhnf3EHiBbC0vwHAPuHp7720bdtTH0GmhniSLu6FnZohbnSaDlTXJaXgqxuDMyrVE5lSjMy1v/hUW6tj6ewQmpcheXMgpArX3fNiUNzHgFp21wTznHAlo+E4q7JC9a5QaV/uONbiLgETqlirRz0jTMfKxp6xQUjEJU6jE1anLVO9JuZkb9PqN99TFjrlzv6TPhSQnzVausQD/VouHYJUXer4yuK7OHZO4JoVm8iSfleQ4XaNnxzU4U6CRzJnaGJfSSa4u9kdoAI7bVvxF0hEQ9vDEV4F8Ze6aIAX5/v8G919x+hvkGjURACuR7oE=
-  file: wheelhouse/bencoder*.whl
-  file_glob: true
-  skip_cleanup: true
-  on:
-    tags: true
-    repo: whtsky/bencoder.pyx
+  - if [ $TRAVIS_TAG ]; then source ci/deploy.sh; fi
diff --git a/README.rst b/README.rst
@@ -5,8 +5,8 @@ A fast bencode implementation in Cython supports both Python2 & Python3 .
 
 .. image:: https://img.shields.io/travis/whtsky/bencoder.pyx/master.svg?maxAge=3600&label=macOS
     :target: https://travis-ci.org/whtsky/bencoder.pyx
-.. image:: https://img.shields.io/appveyor/ci/whtsky/bencoder.pyx/master.svg?maxAge=3600&label=Windows
-    :target: https://ci.appveyor.com/project/whtsky/bencoder.pyx
+.. image:: https://img.shields.io/appveyor/ci/whtsky/bencoder-pyx/master.svg?maxAge=3600&label=Windows
+    :target: https://ci.appveyor.com/project/whtsky/bencoder-pyx
 .. image:: https://semaphoreci.com/api/v1/whtsky/bencoder-pyx/branches/master/shields_badge.svg
     :target: https://semaphoreci.com/whtsky/bencoder-pyx
 
diff --git a/appveyor.yml b/appveyor.yml
@@ -2,7 +2,7 @@ version: '{branch}-{build}'
 cache:
   - '%LOCALAPPDATA%\pip\Cache'
 environment:
-  password:
+  PYPI_PASSWD:
     secure: pp1j5lAB9NN8ZDasgY+oxoGrNw0+4gGzbNZmHVwJkCzUyrNBP5ZIuCrwjmx4q6ifg7RMiE3bVt9MljFCJh3XpsvVOAcx+AGKsHSjtXd40HM=
 init:
   - ps: "ls C:/Python*"
@@ -18,20 +18,20 @@ build: off
 test_script:
   - tox
 
-on_success:
+after_test:
   - pip install codecov
   - codecov
+  - del bencoder.c
   - tox -c tox-wheels.ini
+  - ps: "ls wheelhouse/*"
 
 deploy_script:
-  - echo [distutils]                                  > %USERPROFILE%\\.pypirc
-  - echo index-servers =                             >> %USERPROFILE%\\.pypirc
-  - echo     pypi                                    >> %USERPROFILE%\\.pypirc
-  - echo [pypi]                                      >> %USERPROFILE%\\.pypirc
-  - echo username=whtsky                             >> %USERPROFILE%\\.pypirc
-  - echo password=%password%                         >> %USERPROFILE%\\.pypirc
-  - set HOME=%USERPROFILE%
-  - pip install twine
-  - ps: if($env:APPVEYOR_REPO_TAG -eq $TRUE) { "twine upload wheelhouse/bencoder*.whl" }
+  - ps: >-
+      if($env:appveyor_repo_tag -eq 'True') {
+          $env:Path += ";C:\Python35;C:\Python35\scripts"
+          pip install twine
+          twine upload --username whtsky --password $env:PYPI_PASSWD wheelhouse/bencoder*.whl
+      }
 
-deploy : on
+artifacts:
+  - path: wheelhouse/bencoder*.whl
diff --git a/ci/deploy.sh b/ci/deploy.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+pip install twine
+twine upload --username whtsky --password $PYPI_PASSWORD wheelhouse/bencoder*.whl
diff --git a/ci/travis_osx_script.sh b/ci/travis_osx_script.sh
@@ -1,2 +1,4 @@
 python setup.py test
+bash <(curl -s https://codecov.io/bash)
+rm bencoder.c
 pip wheel . -w wheelhouse/
diff --git a/release.sh b/release.sh
@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
+rm -rf wheelhouse/
+rm -rf dist/
 cython bencoder.pyx
 python setup.py sdist --formats=zip,gztar register
 tox -c tox-wheels.ini
 twine upload dist/*
+twine upload wheelhouse/*
diff --git a/tox-wheels.ini b/tox-wheels.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26, py27, py33, py34, py35, pypy
+envlist = py26, py27, py33, py34, py35
 
 [testenv]
 commands = pip wheel {toxinidir} -w {toxinidir}/wheelhouse/

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+#!/bin/bash`
	`2`	`+pip install twine`
	`3`	`+twine upload --username whtsky --password $PYPI_PASSWORD wheelhouse/bencoder*.whl`