Commit Graph

457 Commits

Author SHA1 Message Date
Florian Bruhin
7ef64c0f87 Read $PYTHON in every tox.ini environment
See #2341
2017-12-04 06:45:47 +01:00
Florian Bruhin
2c2d7fe734 Copy-paste pylint commands for second environment
Otherwise, tox 2.3.1 (shipped with various distributions) fails with:

    tox.ConfigError: ConfigError: substitution key 'posargs' not found
2017-12-04 06:36:42 +01:00
Ryan Farley
df6ff55b7a allow pytest to default to link_pyqt
link_pyqt now checks for LINK_PYQT_SKIP, allowing pytest env names like
`py36` to work properly without negative conditionals in tox.ini
2017-12-01 10:51:41 -06:00
Ryan Farley
49485ca220 tox.ini: fix conditional syntax errors
`{[testenv]deps}` was passing conditionals in their raw form; this
simply lists them manually to avoid this.
2017-11-30 16:58:14 -06:00
Ryan Farley
a5d0b9851a tox.ini: remove pyqt5.6, use requirements-pyqt.txt 2017-11-30 14:14:11 -06:00
Ryan Farley
f7b0ac503e generate pytest envs with tox factors
This eliminates all separate pytest envs in favor of conditionals in
[testenv]. This requires renaming some environments to make the lack of
certain functionality explicit:

- instead of omitting pyqt{version}, use pyqtlink to use host PyQt

tox.ini: eliminate -nocov

It is possible to set the `PYTEST_ADDOPTS` environment variable to
enable coverage checks, rather than a new command.
2017-11-30 08:29:00 -06:00
Florian Bruhin
15c7ede916 Update to PyQt 5.9.2 2017-11-24 14:24:15 +01:00
Florian Bruhin
4bca180a44 Pass HOME to PyInstaller environment
This prevents some weird Homebrew errors.
2017-10-11 14:09:45 +02:00
Florian Bruhin
1a381bf0a5 eslint: Report unused disables 2017-09-29 22:29:18 +02:00
Florian Bruhin
e7dba338b5 Pass %APPDATA% to pyinstaller env
This hopefully helps with PyInstaller creating a ~ directory
2017-09-26 07:30:54 +02:00
Florian Bruhin
40882c4ce2 Fix python version for -cov envs 2017-09-13 00:53:33 +02:00
Florian Bruhin
f6a0500bd3 Merge branch 'master' into new-config
This pulls the travis changes to drop the old Qt 5.2 environment.
2017-09-11 18:39:41 +02:00
Florian Bruhin
e6864b6599 travis: Run eslint without tox on Travis 2017-09-11 18:32:23 +02:00
Florian Bruhin
a11baeb84d travis: Fix some more issues 2017-09-11 18:32:23 +02:00
Florian Bruhin
b4f30f6df2 Move coverage to QtWebEngine environment with PyPI-PyQt 2017-09-11 18:30:23 +02:00
Ryan Roden-Corrent
71b71dbc58 Merge remote-tracking branch 'upstream/master' into HEAD 2017-08-06 18:13:49 -04:00
Florian Bruhin
023bf82638 Update for PyQt 5.9.1 2017-07-04 17:31:09 +02:00
Florian Bruhin
f92ccd4893 Show diff on Travis in check_doc_changes 2017-07-04 15:09:23 +02:00
Florian Bruhin
69337ed264 Update tox default envlist 2017-07-02 13:07:13 +02:00
Florian Bruhin
12520bf4ba Install PyQt from PyPI for pylint
This means we can be sure to have QtWebEngine available and won't have QtWebKit.
2017-05-17 19:08:59 +02:00
Florian Bruhin
a4ddc9706a tox: Also use $PYTHON for pylint 2017-05-17 13:48:31 +02:00
Florian Bruhin
9898d80625 Remove legacy cx_Freeze code
This also removes frozen tests for now. They should be readded at some point...
2017-05-17 11:31:14 +02:00
Florian Bruhin
47bf261994 build_release: Different PyInstaller workaround 2017-05-17 11:10:32 +02:00
Florian Bruhin
dc947bf9a9 build_release: Python version adjustments 2017-05-17 11:09:22 +02:00
Florian Bruhin
68bb0f557f Switch to xoviat pyinstaller branch 2017-05-17 11:05:27 +02:00
Florian Bruhin
a6041834f8 Try adding a PyPI testenv on AppVeyor 2017-03-31 13:05:34 +02:00
Florian Bruhin
134155480e tox: Update PyQt5 to 5.8.2 2017-03-31 10:10:55 +02:00
Florian Bruhin
5d9cd98c0f tox: Add a mkvenv-win-pypi env 2017-03-28 20:42:23 +02:00
Florian Bruhin
1254f4d132 Add -bb when running tests
Fixes #1989
2017-03-18 21:08:07 +01:00
Florian Bruhin
069f908a61 Get rid of run_pytest.py
Fixes #2452
2017-03-18 21:03:52 +01:00
Florian Bruhin
3a88b70eca Fix PyQt5 version in tox.ini 2017-03-13 09:11:22 +01:00
Florian Bruhin
68247a1ef0 Fix PyQt5 requirements
See https://www.riverbankcomputing.com/pipermail/pyqt/2017-March/038964.html
2017-03-13 07:39:21 +01:00
Florian Bruhin
3925fa2872 Use separate requirements file for PyQt 2017-03-08 19:09:34 +01:00
Florian Bruhin
ac0409c60d Don't install requirements-pip.txt
It causes stuff to blow up when something in there got upgraded, and we ask pip
to downgrade one of its dependencies.

We still keep the file around so we get notified about updates.
2017-03-08 07:42:08 +01:00
Florian Bruhin
93eab09574 Add a mkvenv-pypi environment to tox.ini 2017-02-25 18:17:32 +01:00
Florian Bruhin
00a8e79311 PyInstaller env: Remove link_pyqt call 2017-02-19 13:05:58 +01:00
Florian Bruhin
687f288453 Update PyInstaller env
We now use PyQt5 from PyPI and apply xoviat's patch for PyQt.
2017-02-19 12:58:58 +01:00
Florian Bruhin
a86170f45d Drop PyQt < 5.7.1 support for QtWebEngine 2017-02-17 14:42:57 +01:00
Florian Bruhin
abded2470a Reenable PyQt 5.6 PyPI tests
To avoid segfaults we need to hardcode the sip version.
We also need to write a Qt.conf as it was missing with PyQt 5.6 and QtWebEngine
can't find its resources.
2017-02-17 12:00:16 +01:00
Florian Bruhin
7596409962 Add PyQt 5.8 PyPI test envs 2017-02-17 07:02:13 +01:00
Florian Bruhin
ce3e24163e Add test environments using PyQt from PyPI
Fixes #2083
2017-02-09 00:50:37 +01:00
Florian Bruhin
8afc215c3d Update recompile_requirements for newer pips
pip now depends on (instead of vendoring) its dependencies, so we needed some
updates there to only install the affected packages once.

Fixes #2255
2017-02-05 01:29:21 +01:00
Florian Bruhin
22fb3c3042 tox: Switch to Python 3.6 2017-01-13 18:25:26 +01:00
Florian Bruhin
5a89ee96d9 Merge branch 'pac' of https://github.com/abbradar/qutebrowser into abbradar-pac 2016-12-22 08:53:10 +01:00
Florian Bruhin
c7970eb2ee Xfail tests which fail on Docker/Travis
See #2183
2016-12-20 21:32:46 +01:00
Nikolay Amiantov
a7d96e0b85 Ignore ESLint warnings for Mozilla's PAC utils 2016-12-07 02:01:19 +03:00
Florian Bruhin
b0e0b1d073 Get rid of requirements-pip.txt
While pinning setuptools/pip versions is still somewhat desirable, we
can't pin it everywhere easily, and the current solution will break
stuff on Windows.
2016-11-03 07:22:31 +01:00
Clayton Craft
e9aaec6d0d Update tox.ini to support Windows, and adjust install instructions 2016-09-08 13:31:17 -07:00
Florian Bruhin
cf070d48f2 WebEngine: Disable createWindow for Qt < 5.7.1
Fixes #1911.

The bugfix is backported in my qt5-webengine-debug package, and
QUTE_QTBUG54419_PATCHED can be set to force qutebrowser to use
createWindow.
2016-09-05 15:08:00 +02:00
Florian Bruhin
2cbb147e33 tox: Get flake8 to run again
Seems like when not passing a file path, flake8 does less (or nothing?!)
2016-08-09 17:12:42 +02:00