Skip to content

Commit

Permalink
Merge pull request #1 from FHaase/develop
Browse files Browse the repository at this point in the history
Fixed various CI-Integrations
  • Loading branch information
FHaase committed Oct 16, 2018
2 parents 91fab02 + 6455be1 commit 2d3dd29
Show file tree
Hide file tree
Showing 18 changed files with 291 additions and 184 deletions.
12 changes: 5 additions & 7 deletions .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

58 changes: 33 additions & 25 deletions .travis.yml
Expand Up @@ -2,49 +2,57 @@ language: python
sudo: false
cache: pip
env:
global:
global:
- LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
- SEGFAULT_SIGNALS=all
matrix:
- TOX_SKIP_MISSING_INTERPRETERS=False
matrix:
- TOXENV=check
- TOXENV=docs
- TOXENV=docs-linkcheck
matrix:
allow_failures:
- env: TOXENV=docs-linkcheck
include:
- python: '3.4'
env:
- TOXENV=3.4-cover,report,coveralls,codecov
- TOXENV=py34-cover,report,coveralls,codecov
- python: '3.4'
env:
- TOXENV=3.4-nocov
- TOXENV=py34-nocov
- python: '3.5'
env:
- TOXENV=3.5-cover,report,coveralls,codecov
- TOXENV=py35-cover,report,coveralls,codecov
- python: '3.5'
env:
- TOXENV=3.5-nocov
- TOXENV=py35-nocov
- python: '3.6'
env:
- TOXENV=3.6-cover,report,coveralls,codecov
- TOXENV=py36-cover,report,coveralls,codecov
- python: '3.6'
env:
- TOXENV=3.6-nocov
- TOXENV=py36-nocov
- python: '3.7'
dist: xenial
sudo: required
env:
- TOXENV=3.7-cover,report,coveralls,codecov
- TOXENV=py37-cover,report,coveralls,codecov
- python: '3.7'
dist: xenial
sudo: required
env:
- TOXENV=3.7-nocov
- TOXENV=py37-nocov
before_install:
- python --version
- uname -a
- lsb_release -a
- python --version
- uname -a
- lsb_release -a
install:
- pip install tox
- virtualenv --version
- easy_install --version
- pip --version
- tox --version
- |
- pip install tox
- virtualenv --version
- easy_install --version
- pip --version
- tox --version
- |
set -ex
if [[ $TRAVIS_PYTHON_VERSION == 'pypy' ]]; then
(cd $HOME
Expand All @@ -66,11 +74,11 @@ install:
fi
set +x
script:
- tox -v
- tox -v
after_failure:
- more .tox/log/* | cat
- more .tox/*/log/* | cat
- more .tox/log/* | cat
- more .tox/*/log/* | cat
notifications:
email:
on_success: never
on_failure: always
email:
on_success: never
on_failure: always
4 changes: 2 additions & 2 deletions README.rst
Expand Up @@ -34,9 +34,9 @@ Overview
:alt: Requirements Status
:target: https://requires.io/github/FHaase/python-pyoneering/requirements/?branch=master

.. |coveralls| image:: https://coveralls.io/repos/FHaase/python-pyoneering/badge.svg?branch=master&service=github
.. |coveralls| image:: https://coveralls.io/repos/github/FHaase/python-pyoneering/badge.svg?branch=master
:alt: Coverage Status
:target: https://coveralls.io/r/FHaase/python-pyoneering
:target: https://coveralls.io/github/FHaase/python-pyoneering?branch=master

.. |codecov| image:: https://codecov.io/github/FHaase/python-pyoneering/coverage.svg?branch=master
:alt: Coverage Status
Expand Down
126 changes: 108 additions & 18 deletions appveyor.yml
@@ -1,33 +1,123 @@
version: '{branch}-{build}'
build: off
cache:
- '%LOCALAPPDATA%\pip\Cache'
- '%LOCALAPPDATA%\pip\Cache'
environment:
global:
WITH_COMPILER: 'cmd /E:ON /V:ON /C .\ci\appveyor-with-compiler.cmd'
matrix:
global:
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:\Python34\python.exe
PYTHON_HOME: C:\Python34
PYTHON_VERSION: '3.4'
PYTHON_ARCH: '32'
- TOXENV: 'py34-cover,report,codecov'
TOXPYTHON: C:\Python34\python.exe
PYTHON_HOME: C:\Python34
PYTHON_VERSION: '3.4'
PYTHON_ARCH: '32'
- TOXENV: 'py34-cover,report,codecov'
TOXPYTHON: C:\Python34-x64\python.exe
WINDOWS_SDK_VERSION: v7.1
PYTHON_HOME: C:\Python34-x64
PYTHON_VERSION: '3.4'
PYTHON_ARCH: '64'

- TOXENV: 'py34-nocov'
TOXPYTHON: C:\Python34\python.exe
PYTHON_HOME: C:\Python34
PYTHON_VERSION: '3.4'
PYTHON_ARCH: '32'
- TOXENV: 'py34-nocov'
TOXPYTHON: C:\Python34-x64\python.exe
WINDOWS_SDK_VERSION: v7.1
PYTHON_HOME: C:\Python34-x64
PYTHON_VERSION: '3.4'
PYTHON_ARCH: '64'

- TOXENV: 'py35-cover,report,codecov'
TOXPYTHON: C:\Python35\python.exe
PYTHON_HOME: C:\Python35
PYTHON_VERSION: '3.5'
PYTHON_ARCH: '32'
- TOXENV: 'py35-cover,report,codecov'
TOXPYTHON: C:\Python35-x64\python.exe
PYTHON_HOME: C:\Python35-x64
PYTHON_VERSION: '3.5'
PYTHON_ARCH: '64'

- TOXENV: 'py35-nocov'
TOXPYTHON: C:\Python35\python.exe
PYTHON_HOME: C:\Python35
PYTHON_VERSION: '3.5'
PYTHON_ARCH: '32'
- TOXENV: 'py35-nocov'
TOXPYTHON: C:\Python35-x64\python.exe
PYTHON_HOME: C:\Python35-x64
PYTHON_VERSION: '3.5'
PYTHON_ARCH: '64'

- TOXENV: 'py36-cover,report,codecov'
TOXPYTHON: C:\Python36\python.exe
PYTHON_HOME: C:\Python36
PYTHON_VERSION: '3.6'
PYTHON_ARCH: '32'
- TOXENV: 'py36-cover,report,codecov'
TOXPYTHON: C:\Python36-x64\python.exe
PYTHON_HOME: C:\Python36-x64
PYTHON_VERSION: '3.6'
PYTHON_ARCH: '64'

- TOXENV: 'py36-nocov'
TOXPYTHON: C:\Python36\python.exe
PYTHON_HOME: C:\Python36
PYTHON_VERSION: '3.6'
PYTHON_ARCH: '32'
- TOXENV: 'py36-nocov'
TOXPYTHON: C:\Python36-x64\python.exe
PYTHON_HOME: C:\Python36-x64
PYTHON_VERSION: '3.6'
PYTHON_ARCH: '64'

- TOXENV: 'py37-cover,report,codecov'
TOXPYTHON: C:\Python37\python.exe
PYTHON_HOME: C:\Python37
PYTHON_VERSION: '3.7'
PYTHON_ARCH: '32'
- TOXENV: 'py37-cover,report,codecov'
TOXPYTHON: C:\Python37-x64\python.exe
PYTHON_HOME: C:\Python37-x64
PYTHON_VERSION: '3.7'
PYTHON_ARCH: '64'

- TOXENV: 'py37-nocov'
TOXPYTHON: C:\Python37\python.exe
PYTHON_HOME: C:\Python37
PYTHON_VERSION: '3.7'
PYTHON_ARCH: '32'
- TOXENV: 'py37-nocov'
TOXPYTHON: C:\Python37-x64\python.exe
PYTHON_HOME: C:\Python37-x64
PYTHON_VERSION: '3.7'
PYTHON_ARCH: '64'

init:
- ps: echo $env:TOXENV
- ps: ls C:\Python*
- ps: echo $env:TOXENV
- ps: ls C:\Python*
install:
- python -u ci\appveyor-bootstrap.py
- '%PYTHON_HOME%\Scripts\virtualenv --version'
- '%PYTHON_HOME%\Scripts\easy_install --version'
- '%PYTHON_HOME%\Scripts\pip --version'
- '%PYTHON_HOME%\Scripts\tox --version'
- python -u ci\appveyor-bootstrap.py
- '%PYTHON_HOME%\Scripts\virtualenv --version'
- '%PYTHON_HOME%\Scripts\easy_install --version'
- '%PYTHON_HOME%\Scripts\pip --version'
- '%PYTHON_HOME%\Scripts\tox --version'
test_script:
- '%WITH_COMPILER% %PYTHON_HOME%\Scripts\tox'
- '%WITH_COMPILER% %PYTHON_HOME%\Scripts\tox'

on_failure:
- ps: dir "env:"
- ps: get-content .tox\*\log\*
- ps: dir "env:"
- ps: get-content .tox\*\log\*
artifacts:
- path: dist\*
- path: dist\*

### To enable remote debugging uncomment this (also, see: http://www.appveyor.com/docs/how-to/rdp-to-build-worker):
# on_finish:
Expand Down
1 change: 0 additions & 1 deletion ci/appveyor-bootstrap.py
Expand Up @@ -5,7 +5,6 @@
with various fixes and improvements that just weren't feasible to implement in PowerShell.
"""
from __future__ import print_function

from os import environ
from os.path import exists
from subprocess import check_call
Expand Down
3 changes: 2 additions & 1 deletion ci/appveyor-download.py
Expand Up @@ -10,9 +10,10 @@

import argparse
import os
import requests
import zipfile

import requests


def make_auth_headers():
"""Make the authentication headers needed to use the Appveyor API."""
Expand Down
4 changes: 2 additions & 2 deletions ci/bootstrap.py
Expand Up @@ -2,14 +2,14 @@
# -*- coding: utf-8 -*-
from __future__ import absolute_import, print_function, unicode_literals

import sys

import os
import sys
from os.path import abspath
from os.path import dirname
from os.path import exists
from os.path import join


if __name__ == "__main__":
base_path = dirname(dirname(abspath(__file__)))
print("Project path: {0}".format(base_path))
Expand Down

0 comments on commit 2d3dd29

Please sign in to comment.