Skip to content

Commit 8a4873d

Browse files
authored
Merge pull request #1506 from plotly/loosen-testing-reqs
Loosen testing requirements & improve testing
2 parents cd2ff7c + c24b382 commit 8a4873d

21 files changed

+860
-1162
lines changed

.pylintrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ disable=fixme,
6161
old-style-class,
6262
superfluous-parens,
6363
bad-continuation,
64-
line-too-long
64+
line-too-long,
65+
bad-option-value
6566

6667

6768
# Enable the message, report, category or checker with the given id(s). You can

.pylintrc37

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,10 @@ disable=invalid-name,
149149
too-many-lines,
150150
too-many-statements,
151151
bad-continuation,
152-
line-too-long
152+
line-too-long,
153+
super-with-arguments,
154+
raise-missing-from,
155+
bad-option-value
153156

154157
# Enable the message, report, category or checker with the given id(s). You can
155158
# either give multiple identifier separated by comma (,) or put this option

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ All notable changes to `dash` will be documented in this file.
33
This project adheres to [Semantic Versioning](https://semver.org/).
44

55
## [UNRELEASED]
6+
### Changed
7+
- [#1503](https://github.com/plotly/dash/pull/1506) Fix [#1466](https://github.com/plotly/dash/issues/1466): loosen `dash[testing]` requirements for easier integration in external projects. This PR also bumps many `dash[dev]` requirements.
8+
69
### Fixed
710
- [#1493](https://github.com/plotly/dash/pull/1493) Fix [#1143](https://github.com/plotly/dash/issues/1143), a bug where having a file with one of several common names (test.py, code.py, org.py, etc) that imports a dash component package would make `import dash` fail with a cryptic error message asking whether you have a file named "dash.py"
811

dash/testing/application_runners.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ def _stop_server():
125125
stopper()
126126
return "Flask server is shutting down"
127127

128-
# pylint: disable=arguments-differ,C0330
128+
# pylint: disable=arguments-differ
129129
def start(self, app, **kwargs):
130130
"""Start the app server in threading flavor."""
131131
app.server.add_url_rule(self.stop_route, self.stop_route, self._stop_server)

dash/testing/browser.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -358,9 +358,9 @@ def wait_for_page(self, url=None, timeout=10):
358358

359359
if self._pause:
360360
try:
361-
import pdb as pdb_
361+
import pdb as pdb_ # pylint: disable=import-outside-toplevel
362362
except ImportError:
363-
import ipdb as pdb_
363+
import ipdb as pdb_ # pylint: disable=import-outside-toplevel
364364

365365
pdb_.set_trace()
366366

dash/testing/plugin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def pytest_addoption(parser):
6565
def pytest_addhooks(pluginmanager):
6666
# https://github.com/pytest-dev/pytest-xdist/blob/974bd566c599dc6a9ea291838c6f226197208b46/xdist/plugin.py#L67
6767
# avoid warnings with pytest-2.8
68-
from dash.testing import newhooks
68+
from dash.testing import newhooks # pylint: disable=import-outside-toplevel
6969

7070
method = getattr(pluginmanager, "add_hookspecs", None)
7171
if method is None:

requires-dev.txt

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
dash_flow_example==0.0.5
22
dash-dangerously-set-inner-html
3-
isort==4.3.21
4-
mock==4.0.1;python_version>="3.0"
3+
isort==4.3.21;python_version<"3.7"
4+
mock==4.0.3;python_version>="3.0"
55
mock==3.0.5;python_version=="2.7"
6-
flake8==3.7.9
7-
PyYAML==5.3
8-
pylint==1.9.4;python_version<"3.7"
9-
pylint==2.3.1;python_version=="3.7"
10-
astroid==2.2.5;python_version=="3.7"
6+
flake8==3.8.4
7+
PyYAML==5.3.1
8+
pylint==1.9.5;python_version<"3.7"
9+
pylint==2.6.0;python_version>="3.7"
10+
astroid==2.4.2;python_version>="3.7"
1111
black==19.10b0;python_version>="3.0"
12-
virtualenv==20.0.10;python_version=="2.7"
13-
fire==0.2.1
14-
coloredlogs==14.0
12+
virtualenv==20.2.2;python_version=="2.7"
13+
fire==0.3.1
14+
coloredlogs==15.0
15+
flask-talisman==0.7.0

requires-testing.txt

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
pytest==6.0.1;python_version>="3.0"
2-
pytest==4.6.9;python_version=="2.7"
3-
pytest-sugar==0.9.4
4-
pytest-mock==3.2.0;python_version>="3.0"
5-
pytest-mock==2.0.0;python_version=="2.7"
6-
lxml==4.6.1
7-
selenium==3.141.0
8-
percy==2.0.2
9-
cryptography==3.0
10-
requests[security]==2.21.0
11-
beautifulsoup4==4.8.2
12-
waitress==1.4.3
13-
flask-talisman==0.7.0
1+
pytest>=6.0.2;python_version>="3.0"
2+
pytest>=4.6,<5;python_version=="2.7"
3+
pytest-sugar>=0.9.4
4+
pytest-mock>=3.2.0;python_version>="3.0"
5+
pytest-mock>=2.0.0,<3;python_version=="2.7"
6+
lxml>=4.6.2
7+
selenium>=3.141.0
8+
percy>=2.0.2
9+
requests[security]>=2.21.0
10+
beautifulsoup4>=4.8.2,<=4.9.3;python_version=="2.7"
11+
beautifulsoup4>=4.8.2;python_version>="3.0"
12+
waitress>=1.4.4

tests/integration/IntegrationTests.py

Lines changed: 0 additions & 138 deletions
This file was deleted.

0 commit comments

Comments
 (0)