ci

.circleci/config.yml

@@ -9,7 +9,7 @@ jobs:
           - checkout
           - run:
               name: install packages
-              command: .circleci/install-dev.sh
+              command: ci/install-ci.sh
           - run:
               name: test
               command: make compile && make test

MANIFEST.in

@@ -3,6 +3,7 @@ include LICENSE
 include README.rst
 include docs/make.bat
 include docs/Makefile
+recursive-include requirements
 recursive-include examples *.py *.js *.css *.html
 recursive-include tests *.py *.txt
 recursive-include pulsar/apps/test/plugins/htmlfiles *.js *.css *.html

appveyor.yml

@@ -1,30 +1,42 @@
 environment:
-
+  PYPI_PASSWD:
+    secure: w16EmxgfwQdS1FLB/PCWQA==
   matrix:
-    # Pre-installed Python versions, which Appveyor may upgrade to
-    # a later point release.
     - PYTHON: "C:\\Python35"
-      PYTHON_VERSION: "3.5.x"
-      PYTHON_ARCH: "32"
-
     - PYTHON: "C:\\Python35-x64"
-      PYTHON_VERSION: "3.5.x"
-      PYTHON_ARCH: "64"
+    - PYTHON: "C:\\Python36"
+    - PYTHON: "C:\\Python36-x64"
 
 init:
   - "ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH%"
 
+install:
+  - "ci/build.cmd %PYTHON%\\python.exe -m pip install -U wheel setuptools"
+  - "ci/build.cmd %PYTHON%\\python.exe -m pip install -r requirements/test.txt"
+
 install:
   - "%WITH_COMPILER% %PYTHON%/python -V"
   - "%WITH_COMPILER% %PYTHON%/python -m pip install -r requirements-dev-win.txt"
   - cmd: nuget install redis-64 -excludeversion
   - cmd: redis-64\tools\redis-server.exe --service-install
   - cmd: redis-64\tools\redis-server.exe --service-start
 
-build: off
+build: false
 
 test_script:
-  - "%WITH_COMPILER% %PYTHON%/python setup.py test -q"
+  - "ci/build.cmd %PYTHON%\\python.exe setup.py test"
+
+after_test:
+  - "ci/build.cmd %PYTHON%\\python.exe setup.py sdist bdist_wheel"
+
+artifacts:
+  - path: dist\*
+
+deploy_script:
+  - ps: >-
+      if($env:appveyor_repo_tag -eq 'True') {
+          Invoke-Expression "$env:PYTHON\\python.exe -m twine upload dist/* --username lsbardel --password $env:PYPI_PASSWD"
+      }
 
 notifications:
   - provider: Email

.circleci/build-wheels.sh → ci/build-wheels.sh

@@ -3,8 +3,8 @@
 set -e -x
 
 
-PACKAGE_VERSION=$(python ".ci/package-version.py")
-PYPI_VERSION=$(python ".ci/pypi-check.py" "${PYMODULE}")
+PACKAGE_VERSION=$(python "ci/package-version.py")
+PYPI_VERSION=$(python "ci/pypi-check.py" "${PYMODULE}")
 
 if [ "${PACKAGE_VERSION}" == "${PYPI_VERSION}" ]; then
     echo "${PYMODULE}-${PACKAGE_VERSION} is already published on PyPI"

ci/build.cmd

@@ -0,0 +1,21 @@
+@echo off
+:: To build extensions for 64 bit Python 3, we need to configure environment
+:: variables to use the MSVC 2010 C++ compilers from GRMSDKX_EN_DVD.iso of:
+:: MS Windows SDK for Windows 7 and .NET Framework 4
+::
+:: More details at:
+:: https://github.com/cython/cython/wiki/64BitCythonExtensionsOnWindows
+
+IF "%DISTUTILS_USE_SDK%"=="1" (
+    ECHO Configuring environment to build with MSVC on a 64bit architecture
+    ECHO Using Windows SDK 7.1
+    "C:\Program Files\Microsoft SDKs\Windows\v7.1\Setup\WindowsSdkVer.exe" -q -version:v7.1
+    CALL "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 /release
+    SET MSSdk=1
+    REM Need the following to allow tox to see the SDK compiler
+    SET TOX_TESTENV_PASSENV=DISTUTILS_USE_SDK MSSdk INCLUDE LIB
+) ELSE (
+    ECHO Using default MSVC build environment
+)
+
+CALL %*

.circleci/install-dev.sh → ci/install-ci.sh

@@ -2,5 +2,5 @@
 
 pip install --upgrade pip wheel
 pip install --upgrade setuptools
-pip install -r requirements-ci.txt
-pip install -r requirements.txt
+pip install -r requirements/ci.txt
+pip install -r requirements/hard.txt

install-dev.sh

@@ -2,6 +2,6 @@
 
 pip install --upgrade pip wheel
 pip install --upgrade setuptools
-pip install -r requirements-dev.txt
-pip install -r requirements.txt
+pip install -r requirements/dev.txt
+pip install -r requirements/hard.txt
 pyslink pulsar

requirements/ci.txt

@@ -0,0 +1,3 @@
+-r test.txt
+uvloop
+httptools

requirements/dev.txt

@@ -0,0 +1,5 @@
+-r ci.txt
+setproctitle
+psutil
+unidecode
+pyslink

requirements/docs.txt

@@ -0,0 +1,2 @@
+recommonmark
+sphinxcontrib-spelling

requirements-ci.txt → requirements/test.txt

@@ -1,11 +1,9 @@
 flake8
+coverage
 cython
 greenlet
 flask
 oauthlib
 requests
 certifi
-recommonmark
 twine
-uvloop
-httptools

setup.py

@@ -73,7 +73,8 @@ def sh(command):
     license="BSD",
     long_description=read('README.rst'),
     include_package_data=True,
-    install_requires=requirements('requirements.txt')[0],
+    install_requires=requirements('requirements/hard.txt')[0],
+    tests_require=requirements('requirements/test.txt')[0],
     setup_requires=['wheel'],
     packages=find_packages(include=['pulsar', 'pulsar.*', 'pulsar_test']),
     entry_points={