diff --git a/.gitignore b/.gitignore index fe78fa6c5..d5f4ad962 100644 --- a/.gitignore +++ b/.gitignore @@ -1,18 +1,18 @@ *.pyc -/style.rcc -/style_pyside_rc.py -./.idea -/.idea/ + dist/ -docs/ -QDarkStyle.egg-info/ build/ +docs/ + +*.egg-info/ __pycache__ + *.tar *.tar.* *.log *.log.* *.sig + pkg/ src/ @@ -32,4 +32,6 @@ deb_dist .mypy_cache .cache .env - +./.idea +/.idea/ +.tox diff --git a/.travis.yml b/.travis.yml index c4a061a45..badeef733 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,16 @@ -language: python -python: - - "2.7" - - "3.4" -virtualenv: - system_site_packages: true -before_install: - - sudo apt-get update - - sudo apt-get install -qq python-pyside --fix-missing - - sudo apt-get install -qq python-qt4 --fix-missing - - sudo apt-get install -qq python3-pyside --fix-missing - - sudo apt-get install -qq python3-pyqt4 --fix-missing +anguage: python +matrix: + include: + - python: 2.7 + env: TOXENV=py27 + - python: 3.4 + env: TOXENV=py34 + - python: 3.6 + env: TOXENV=py36 +install: + - pip install tox +script: + - tox - "export DISPLAY=:99.0" - "sh -e /etc/init.d/xvfb start" before_script: diff --git a/qdarkstyle/.gitignore b/qdarkstyle/.gitignore deleted file mode 100644 index a74b07aee..000000000 --- a/qdarkstyle/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/*.pyc diff --git a/tox.ini b/tox.ini new file mode 100644 index 000000000..6cab8ca41 --- /dev/null +++ b/tox.ini @@ -0,0 +1,62 @@ +[tox] +envlist = + #{win,lin,mac}-{py34}-{pyqt,pyside} + {win,lin,mac}-{py36}-{pyqt5,pyside2} + +skip_missing_interpreters = + true + +[testenv] +platform = + # platforms to run + win: windows + lin: linux + mac: osx + +deps = + # to make sure it has + setuptools + pip + wheel + virtualenv + qtpy + pytest + pytest-qt + + # basic dependencies for each env + pyqt: pyqt + pyqt5: pyqt5 + pyside: pyside + pyside2: pyside2 + +whitelist_externals = + # non python dependencies + qmake + doc: make + doc: latexpdf + +changedir = + script + +commands = + python process_ui.py + python process_qrc.py + + pip install ../. + + python -m qdarkstyle --all + + pyqt: python ../example/example.py --qt_from=pyqt --test + pyqt: python ../example/example.py --qt_from=pyqt --test --no_dark + + pyqt5: python ../example/example.py --qt_from=pyqt5 --test + pyqt5: python ../example/example.py --qt_from=pyqt5 --test --no_dark + + pyside: python ../example/example.py --qt_from=pyside --test + pyside: python ../example/example.py --qt_from=pyside --test --no_dark + + pyside2: python ../example/example.py --qt_from=pyside2 --test + pyside2: python ../example/example.py --qt_from=pyside2 --test --no_dark + +usedevelop = + develop: true