Merge branch 'develop'

Author: whtsky

.coveragerc

@@ -0,0 +1,15 @@
+[run]
+plugins = Cython.Coverage
+source = bencoder
+
+[report]
+exclude_lines =
+    pragma: no cover
+
+    def __repr__
+
+    raise AssertionError
+    raise NotImplementedError
+
+    if 0:
+    if __name__ == .__main__.:

.gitignore

@@ -9,6 +9,7 @@ __pycache__/
 # Distribution / packaging
 .Python
 env/
+venv/
 build/
 develop-eggs/
 dist/
@@ -24,6 +25,8 @@ var/
 *.egg-info/
 .installed.cfg
 *.egg
+*.whl
+.python-version
 
 # PyInstaller
 #  Usually these files are written by a python script from a template

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "terryfy"]
-	path = terryfy
-	url = https://github.com/MacPython/terryfy.git

.travis.yml

@@ -1,31 +1,42 @@
-language:
-  - objective-c
-
+os: osx
+language: generic
 env:
-  matrix:
-    - VERSION=2.7.11
-    - VERSION=3.3.5
-    - VERSION=3.4.4
-    - VERSION=3.5.1
+  - VERSION=2.7
+  - VERSION=3.3
+  - VERSION=3.4
+  - VERSION=3.5
+
+matrix:
+  include:
+    - sudo: required
+      os: linux
+      services:
+        - docker
+      env: DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
+    - sudo: required
+      os: linux
+      services:
+        - docker
+      env: DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
+           PRE_CMD=linux32
 
 install:
-  - source terryfy/library_installers.sh
-  - clean_builds
-  - get_python_environment macpython $VERSION venv
-  - pip install --upgrade pip wheel cython
+  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then source ci/travis_osx_install.sh; fi
+  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then source ci/travis_linux_install.sh; fi
 
 script:
-  - python setup.py test
+  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then source ci/travis_osx_script.sh; fi
+  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then source ci/travis_linux_script.sh; fi
 
 after_success:
-  - pip wheel . -w wheelhouse/
   - 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/*.whl
+  file: wheelhouse/bencoder*.whl
   file_glob: true
   skip_cleanup: true
   on:

MANIFEST.in

@@ -1,2 +1,2 @@
-include bencoder.pyx README.rst LICENSE
+include bencoder.c bencoder.pyx README.rst pytest.ini LICENSE
 recursive-include tests *

README.rst

@@ -3,11 +3,18 @@ Bencoder.pyx
 
 A fast bencode implementation in Cython supports both Python2 & Python3 .
 
-.. image:: https://travis-ci.org/whtsky/bencoder.pyx.svg?branch=master
+.. 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://semaphoreci.com/api/v1/whtsky/bencoder-pyx/branches/master/shields_badge.svg
+    :target: https://semaphoreci.com/whtsky/bencoder-pyx
 
-.. image:: https://ci.appveyor.com/api/projects/status/ur6vy8wdj789oxqv/branch/master?svg=true
-    :target: https://ci.appveyor.com/project/whtsky/bencoder-pyx
+
+.. image:: https://img.shields.io/travis/whtsky/bencoder.pyx/master.svg?maxAge=3600&label=wheels
+    :target: https://travis-ci.org/whtsky/bencoder.pyx
+.. image:: https://codecov.io/gh/whtsky/bencoder.pyx/branch/master/graph/badge.svg
+    :target: https://codecov.io/gh/whtsky/bencoder.pyx
 
 Install
 -------
@@ -36,6 +43,11 @@ Usage
 ChangeLog
 ----------
 
+Version 1.1.2
+~~~~~~~~~~~~~~~
+
++ Support encode large int
+
 Version 1.1.0
 ~~~~~~~~~~~~~~~
 

appveyor.yml

@@ -1,83 +1,37 @@
+version: '{branch}-{build}'
+cache:
+  - '%LOCALAPPDATA%\pip\Cache'
 environment:
-  global:
-    # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
-    # /E:ON and /V:ON options are not enabled in the batch script intepreter
-    # See: http://stackoverflow.com/a/13751649/163740
-    CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\appveyor\\run_with_env.cmd"
-
-  matrix:
-
-    # Pre-installed Python versions, which Appveyor may upgrade to
-    # a later point release.
-    # See: http://www.appveyor.com/docs/installed-software#python
-
-    - PYTHON: "C:\\Python27"
-      PYTHON_VERSION: "2.7.x" # currently 2.7.9
-      PYTHON_ARCH: "32"
-
-    - PYTHON: "C:\\Python27-x64"
-      PYTHON_VERSION: "2.7.x" # currently 2.7.9
-      PYTHON_ARCH: "64"
-
-    - PYTHON: "C:\\Python33"
-      PYTHON_VERSION: "3.3.x" # currently 3.3.5
-      PYTHON_ARCH: "32"
-
-    - PYTHON: "C:\\Python33-x64"
-      PYTHON_VERSION: "3.3.x" # currently 3.3.5
-      PYTHON_ARCH: "64"
-
-    - PYTHON: "C:\\Python34"
-      PYTHON_VERSION: "3.4.x" # currently 3.4.3
-      PYTHON_ARCH: "32"
-
-    - PYTHON: "C:\\Python34-x64"
-      PYTHON_VERSION: "3.4.x" # currently 3.4.3
-      PYTHON_ARCH: "64"
-
-    # Python versions not pre-installed
-
-    # Python 2.6.6 is the latest Python 2.6 with a Windows installer
-    # See: https://github.com/ogrisel/python-appveyor-demo/issues/10
-
-    - PYTHON: "C:\\Python266"
-      PYTHON_VERSION: "2.6.6"
-      PYTHON_ARCH: "32"
-
-    - PYTHON: "C:\\Python266-x64"
-      PYTHON_VERSION: "2.6.6"
-      PYTHON_ARCH: "64"
-
-    - PYTHON: "C:\\Python35"
-      PYTHON_VERSION: "3.5.0"
-      PYTHON_ARCH: "32"
-
-    - PYTHON: "C:\\Python35-x64"
-      PYTHON_VERSION: "3.5.0"
-      PYTHON_ARCH: "64"
-
+  password:
+    secure: pp1j5lAB9NN8ZDasgY+oxoGrNw0+4gGzbNZmHVwJkCzUyrNBP5ZIuCrwjmx4q6ifg7RMiE3bVt9MljFCJh3XpsvVOAcx+AGKsHSjtXd40HM=
 init:
-  - "ECHO Python %PYTHON_VERSION% (%PYTHON_ARCH%bit) from %PYTHON%"
+  - ps: "ls C:/Python*"
 
 install:
-  # Install Python (from the official .msi of http://python.org) and pip when
-  # not already installed.
-  - ps: if (-not(Test-Path($env:PYTHON))) { & appveyor\install.ps1 }
-  - "%PYTHON%\\Scripts\\pip install --disable-pip-version-check --user --upgrade pip wheel cython"
+  - choco install python.pypy > pypy-inst.log 2>&1 || (type pypy-inst.log & exit /b 1)
+  - SET PATH=C:\Python35;C:\Python35\scripts;C:\tools\pypy\pypy;%PATH%
+  - echo "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 > "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64\vcvars64.bat"
+  - pip install -r dev-requirements.txt
 
-build_script:
-  - "%PYTHON%\\python setup.py install"
+build: off
 
 test_script:
-  - "%PYTHON%\\python setup.py test"
-
-after_test:
-  - "%PYTHON%\\python setup.py bdist_wheel bdist_wininst bdist_msi"
-  - ps: "ls dist"
-
-artifacts:
-  - path: dist\*
-
-#on_success:
-#  - TODO: upload the content of dist/*.whl to a public wheelhouse
-#
+  - tox
+
+on_success:
+  - pip install codecov
+  - codecov
+  - tox -c tox-wheels.ini
+
+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" }
+
+deploy : on