Add in a osx env and reformat this mess.

ionelmc · Jan 18, 2019 · 2f5452c · 2f5452c
1 parent 4a9629b
commit 2f5452c
Show file tree

Hide file tree

Showing 5 changed files with 186 additions and 19 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -11,3 +11,6 @@ charset = utf-8
 
 [*.{bat,cmd,ps1}]
 end_of_line = crlf
+
+[*.yml]
+indent_size = 2
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ cache: pip
 addons:
   apt:
     packages:
-    - gdb
+      - gdb
 env:
   global:
     - LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
@@ -22,68 +22,213 @@ matrix:
     - python: '2.7'
       env:
         - TOXENV=py27-pure-nocov
+    - os: osx
+      language: generic
+      env:
+        - SETUPPY_CFLAGS=
+        - CIBW_BUILD=cp27
+        - TOXENV=py27-pure-nocov
+      install:
+        - pip2 install cibuildwheel twine tox
+      before_install:
+        - python --version
+        - uname -a
+      script:
+        - cibuildwheel --output-dir dist
+        - tox --installpkg dist/*.whl
     - python: '2.7'
       env:
         - TOXENV=py27-cython-cover,report,coveralls,codecov
     - python: '2.7'
       env:
         - TOXENV=py27-cython-nocov
+    - os: osx
+      language: generic
+      env:
+        - SETUPPY_CFLAGS=
+        - CIBW_BUILD=cp27
+        - TOXENV=py27-cython-nocov
+      install:
+        - pip2 install cibuildwheel twine tox
+      before_install:
+        - python --version
+        - uname -a
+      script:
+        - cibuildwheel --output-dir dist
+        - tox --installpkg dist/*.whl
+        - twine upload --repository-url https://test.pypi.org/legacy/ --skip-existing dist/*
     - python: '3.4'
       env:
         - TOXENV=py34-pure-cover,report,coveralls,codecov
     - python: '3.4'
       env:
         - TOXENV=py34-pure-nocov
+    - os: osx
+      language: generic
+      env:
+        - SETUPPY_CFLAGS=
+        - CIBW_BUILD=cp34
+        - TOXENV=py34-pure-nocov
+      install:
+        - pip2 install cibuildwheel twine tox
+      before_install:
+        - python --version
+        - uname -a
+      script:
+        - cibuildwheel --output-dir dist
+        - tox --installpkg dist/*.whl
     - python: '3.4'
       env:
         - TOXENV=py34-cython-cover,report,coveralls,codecov
     - python: '3.4'
       env:
         - TOXENV=py34-cython-nocov
+    - os: osx
+      language: generic
+      env:
+        - SETUPPY_CFLAGS=
+        - CIBW_BUILD=cp34
+        - TOXENV=py34-cython-nocov
+      install:
+        - pip2 install cibuildwheel twine tox
+      before_install:
+        - python --version
+        - uname -a
+      script:
+        - cibuildwheel --output-dir dist
+        - tox --installpkg dist/*.whl
+        - twine upload --repository-url https://test.pypi.org/legacy/ --skip-existing dist/*
     - python: '3.5'
       env:
         - TOXENV=py35-pure-cover,report,coveralls,codecov
     - python: '3.5'
       env:
         - TOXENV=py35-pure-nocov
+    - os: osx
+      language: generic
+      env:
+        - SETUPPY_CFLAGS=
+        - CIBW_BUILD=cp35
+        - TOXENV=py35-pure-nocov
+      install:
+        - pip2 install cibuildwheel twine tox
+      before_install:
+        - python --version
+        - uname -a
+      script:
+        - cibuildwheel --output-dir dist
+        - tox --installpkg dist/*.whl
     - python: '3.5'
       env:
         - TOXENV=py35-cython-cover,report,coveralls,codecov
     - python: '3.5'
       env:
         - TOXENV=py35-cython-nocov
+    - os: osx
+      language: generic
+      env:
+        - SETUPPY_CFLAGS=
+        - CIBW_BUILD=cp35
+        - TOXENV=py35-cython-nocov
+      install:
+        - pip2 install cibuildwheel twine tox
+      before_install:
+        - python --version
+        - uname -a
+      script:
+        - cibuildwheel --output-dir dist
+        - tox --installpkg dist/*.whl
+        - twine upload --repository-url https://test.pypi.org/legacy/ --skip-existing dist/*
     - python: '3.6'
       env:
         - TOXENV=py36-pure-cover,report,coveralls,codecov
     - python: '3.6'
       env:
         - TOXENV=py36-pure-nocov
+    - os: osx
+      language: generic
+      env:
+        - SETUPPY_CFLAGS=
+        - CIBW_BUILD=cp36
+        - TOXENV=py36-pure-nocov
+      install:
+        - pip2 install cibuildwheel twine tox
+      before_install:
+        - python --version
+        - uname -a
+      script:
+        - cibuildwheel --output-dir dist
+        - tox --installpkg dist/*.whl
     - python: '3.6'
       env:
         - TOXENV=py36-cython-cover,report,coveralls,codecov
     - python: '3.6'
       env:
         - TOXENV=py36-cython-nocov
+    - os: osx
+      language: generic
+      env:
+        - SETUPPY_CFLAGS=
+        - CIBW_BUILD=cp36
+        - TOXENV=py36-cython-nocov
+      install:
+        - pip2 install cibuildwheel twine tox
+      before_install:
+        - python --version
+        - uname -a
+      script:
+        - cibuildwheel --output-dir dist
+        - tox --installpkg dist/*.whl
+        - twine upload --repository-url https://test.pypi.org/legacy/ --skip-existing dist/*
     - python: '3.7'
       env:
-        - TOXENV=py37-pure-cover,report,coveralls,codecov
-      sudo: required
+        - TOXENV=py37-pure-cover,report,coveralls,codecov      sudo: required
       dist: xenial
+
     - python: '3.7'
       env:
-        - TOXENV=py37-pure-nocov
-      sudo: required
+        - TOXENV=py37-pure-nocov      sudo: required
       dist: xenial
+
+    - os: osx
+      language: generic
+      env:
+        - SETUPPY_CFLAGS=
+        - CIBW_BUILD=cp37
+        - TOXENV=py37-pure-nocov
+      install:
+        - pip2 install cibuildwheel twine tox
+      before_install:
+        - python --version
+        - uname -a
+      script:
+        - cibuildwheel --output-dir dist
+        - tox --installpkg dist/*.whl
     - python: '3.7'
       env:
-        - TOXENV=py37-cython-cover,report,coveralls,codecov
-      sudo: required
+        - TOXENV=py37-cython-cover,report,coveralls,codecov      sudo: required
       dist: xenial
+
     - python: '3.7'
       env:
-        - TOXENV=py37-cython-nocov
-      sudo: required
+        - TOXENV=py37-cython-nocov      sudo: required
       dist: xenial
+
+    - os: osx
+      language: generic
+      env:
+        - SETUPPY_CFLAGS=
+        - CIBW_BUILD=cp37
+        - TOXENV=py37-cython-nocov
+      install:
+        - pip2 install cibuildwheel twine tox
+      before_install:
+        - python --version
+        - uname -a
+      script:
+        - cibuildwheel --output-dir dist
+        - tox --installpkg dist/*.whl
+        - twine upload --repository-url https://test.pypi.org/legacy/ --skip-existing dist/*
     - python: 'pypy'
       env:
         - TOXENV=pypy-pure-cover,report,coveralls,codecov

diff --git a/appveyor.yml b/appveyor.yml
@@ -7,9 +7,9 @@ environment:
     WITH_COMPILER: 'cmd /E:ON /V:ON /C .\ci\appveyor-with-compiler.cmd'
   matrix:
     - TOXENV: check
-      TOXPYTHON: C:\Python27\python.exe
-      PYTHON_HOME: C:\Python27
-      PYTHON_VERSION: '2.7'
+      TOXPYTHON: C:\Python36\python.exe
+      PYTHON_HOME: C:\Python36
+      PYTHON_VERSION: '3.6'
       PYTHON_ARCH: '32'
     - TOXENV: 'py27-pure-cover,report,codecov'
       TOXPYTHON: C:\Python27\python.exe

diff --git a/ci/templates/.travis.yml b/ci/templates/.travis.yml
@@ -4,7 +4,7 @@ cache: pip
 addons:
   apt:
     packages:
-    - gdb
+      - gdb
 env:
   global:
     - LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
@@ -16,16 +16,35 @@ env:
     - TOXENV=docs
 matrix:
   include:
-{%- for env in tox_environments %}{{ '' }}
+{% for env in tox_environments %}
     - python: '{{ env.split("-")[0] if env.startswith("pypy") else "{0[2]}.{0[3]}".format(env) }}'
       env:
-        - TOXENV={{ env }}{% if 'cover' in env %},report,coveralls,codecov{% endif -%}
+        - TOXENV={{ env }}{% if 'cover' in env %},report,coveralls,codecov{% endif %}
 {% if env.startswith('py37') %}
-
       sudo: required
       dist: xenial
-{%- endif -%}
-{%- endfor %}{{ '' }}
+{% endif %}
+
+{% if not env.startswith("pypy") and not env.endswith("cover") %}
+    - os: osx
+      language: generic
+      env:
+        - SETUPPY_CFLAGS=
+        - CIBW_BUILD=cp{{ env.split("-")[0][2:] }}
+        - TOXENV={{ env }}
+      install:
+        - pip2 install cibuildwheel twine tox
+      before_install:
+        - python --version
+        - uname -a
+      script:
+        - cibuildwheel --output-dir dist
+        - tox --installpkg dist/*.whl
+{% if 'pure' not in env %}
+        - twine upload --repository-url https://test.pypi.org/legacy/ --skip-existing dist/*
+{% endif %}
+{% endif %}
+{% endfor %}
 before_install:
   - python --version
   - uname -a

diff --git a/ci/templates/appveyor.yml b/ci/templates/appveyor.yml
@@ -47,7 +47,7 @@ on_failure:
   - ps: dir "env:"
   - ps: get-content .tox\*\log\*
 artifacts:
-  - path: dist\*
+  - path: .tox\dist\*
 
 ### To enable remote debugging uncomment this (also, see: http://www.appveyor.com/docs/how-to/rdp-to-build-worker):
 # on_finish: