Loosen testing requirements & improve testing#1506

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexcjohnson merged 11 commits into from
Dec 17, 2020
Merged

Loosen testing requirements & improve testing #1506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e0a9446
loosen testing requirements
alexcjohnson Dec 16, 2020
c3a7403
robustify cbpu001
alexcjohnson Dec 16, 2020
399373a
modernize race conditions test
alexcjohnson Dec 16, 2020
15ad7f5
update pylint exclusions for new version
alexcjohnson Dec 16, 2020
ec35ca6
reinstate isort requirement, prior to py3.7 only
alexcjohnson Dec 16, 2020
f51749a
one more update to pylint settings
alexcjohnson Dec 16, 2020
37b01bc
make test_resources work alongside other tests
alexcjohnson Dec 16, 2020
32dee50
convert remaining unittest-style tests to pytest
alexcjohnson Dec 16, 2020
2643e50
changelog for dash[testing] loosening
alexcjohnson Dec 17, 2020
8914bb3
robustify cbcx005
alexcjohnson Dec 17, 2020
c24b382
fix new parametrized test rddd002
alexcjohnson Dec 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .pylintrc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,8 @@ disable=fixme,
old-style-class,
superfluous-parens,
bad-continuation,
line-too-long
line-too-long,
bad-option-value


# Enable the message, report, category or checker with the given id(s). You can
Expand Down
5 changes: 4 additions & 1 deletion .pylintrc37
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -149,7 +149,10 @@ disable=invalid-name,
too-many-lines,
too-many-statements,
bad-continuation,
line-too-long
line-too-long,
super-with-arguments,
raise-missing-from,
bad-option-value

# Enable the message, report, category or checker with the given id(s). You can
# either give multiple identifier separated by comma (,) or put this option
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,9 @@ All notable changes to `dash` will be documented in this file.
This project adheres to [Semantic Versioning](https://semver.org/).

## [UNRELEASED]
### Changed
- [#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.

### Fixed
- [#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"

Expand Down
2 changes: 1 addition & 1 deletion dash/testing/application_runners.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -125,7 +125,7 @@ def _stop_server():
stopper()
return "Flask server is shutting down"

# pylint: disable=arguments-differ,C0330
# pylint: disable=arguments-differ
def start(self, app, **kwargs):
"""Start the app server in threading flavor."""
app.server.add_url_rule(self.stop_route, self.stop_route, self._stop_server)
Expand Down
4 changes: 2 additions & 2 deletions dash/testing/browser.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -358,9 +358,9 @@ def wait_for_page(self, url=None, timeout=10):

if self._pause:
try:
import pdb as pdb_
import pdb as pdb_ # pylint: disable=import-outside-toplevel
except ImportError:
import ipdb as pdb_
import ipdb as pdb_ # pylint: disable=import-outside-toplevel

pdb_.set_trace()

Expand Down
2 changes: 1 addition & 1 deletion dash/testing/plugin.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ def pytest_addoption(parser):
def pytest_addhooks(pluginmanager):
# https://github.com/pytest-dev/pytest-xdist/blob/974bd566c599dc6a9ea291838c6f226197208b46/xdist/plugin.py#L67
# avoid warnings with pytest-2.8
from dash.testing import newhooks
from dash.testing import newhooks # pylint: disable=import-outside-toplevel

method = getattr(pluginmanager, "add_hookspecs", None)
if method is None:
Expand Down
21 changes: 11 additions & 10 deletions requires-dev.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
dash_flow_example==0.0.5
dash-dangerously-set-inner-html
isort==4.3.21
mock==4.0.1;python_version>="3.0"
isort==4.3.21;python_version<"3.7"
mock==4.0.3;python_version>="3.0"
mock==3.0.5;python_version=="2.7"
flake8==3.7.9
PyYAML==5.3
pylint==1.9.4;python_version<"3.7"
pylint==2.3.1;python_version=="3.7"
astroid==2.2.5;python_version=="3.7"
flake8==3.8.4
PyYAML==5.3.1
pylint==1.9.5;python_version<"3.7"
pylint==2.6.0;python_version>="3.7"

@Marc-Andre-RivetMarc-Andre-RivetDec 17, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we sanity test these flake8/pylint changes against the other core repos?

@Marc-Andre-RivetMarc-Andre-RivetDec 17, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They have an annoying habit of changing their rules..

@alexcjohnsonalexcjohnsonDec 17, 2020

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good call - they may well need their own updates to .pylintrc files, or syntax updates. PRs coming.

@alexcjohnsonalexcjohnsonDec 17, 2020

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

plotly/dash-core-components#907, plotly/dash-html-components#171, plotly/dash-table#857 - All three, I started with this branch, got tests passing, then reverted to the dev branch of dash and tests still pass - All that was required (other than prohibiting the latest xlrd) was a couple of linting exclusions.

astroid==2.4.2;python_version>="3.7"
black==19.10b0;python_version>="3.0"
virtualenv==20.0.10;python_version=="2.7"
fire==0.2.1
coloredlogs==14.0
virtualenv==20.2.2;python_version=="2.7"
fire==0.3.1
coloredlogs==15.0
flask-talisman==0.7.0

@alexcjohnsonalexcjohnsonDec 17, 2020

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved flask-talisman here from requires-testing because this is used in our tests themselves, not in dash.testing.

25 changes: 12 additions & 13 deletions requires-testing.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
pytest==6.0.1;python_version>="3.0"
pytest==4.6.9;python_version=="2.7"
pytest-sugar==0.9.4
pytest-mock==3.2.0;python_version>="3.0"
pytest-mock==2.0.0;python_version=="2.7"
lxml==4.6.1
selenium==3.141.0
percy==2.0.2
cryptography==3.0
requests[security]==2.21.0
beautifulsoup4==4.8.2
waitress==1.4.3
flask-talisman==0.7.0
pytest>=6.0.2;python_version>="3.0"
pytest>=4.6,<5;python_version=="2.7"
pytest-sugar>=0.9.4
pytest-mock>=3.2.0;python_version>="3.0"
pytest-mock>=2.0.0,<3;python_version=="2.7"
lxml>=4.6.2
selenium>=3.141.0
percy>=2.0.2
requests[security]>=2.21.0
beautifulsoup4>=4.8.2,<=4.9.3;python_version=="2.7"

@alexcjohnsonalexcjohnsonDec 17, 2020

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

beautifulsoup4 has stated it's about to drop Py2 support, so I set a preemptive upper bound for Py2 at the current version.

beautifulsoup4>=4.8.2;python_version>="3.0"
waitress>=1.4.4
138 changes: 0 additions & 138 deletions tests/integration/IntegrationTests.py
View file
Open in desktop

This file was deleted.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Loosen testing requirements & improve testing#1506

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

alexcjohnson
merged 11 commits into

from

Dec 17, 2020
 Merged


Loosen testing requirements & improve testing
#1506
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
e0a9446

loosen testing requirements


alexcjohnson Dec 16, 2020
c3a7403

robustify cbpu001


alexcjohnson Dec 16, 2020
399373a

modernize race conditions test


alexcjohnson Dec 16, 2020
15ad7f5

update pylint exclusions for new version


alexcjohnson Dec 16, 2020
ec35ca6

reinstate isort requirement, prior to py3.7 only


alexcjohnson Dec 16, 2020
f51749a

one more update to pylint settings


alexcjohnson Dec 16, 2020
37b01bc

make test_resources work alongside other tests


alexcjohnson Dec 16, 2020
32dee50

convert remaining unittest-style tests to pytest


alexcjohnson Dec 16, 2020
2643e50

changelog for dash[testing] loosening


alexcjohnson Dec 17, 2020
8914bb3

robustify cbcx005


alexcjohnson Dec 17, 2020
c24b382

fix new parametrized test rddd002


alexcjohnson Dec 17, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
.pylintrc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,8 @@ disable=fixme,
 old-style-class,
 superfluous-parens,
 bad-continuation,
 line-too-long
 line-too-long,
 bad-option-value


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

5 changes: 4 additions & 1 deletion
.pylintrc37

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -149,7 +149,10 @@ disable=invalid-name,
 too-many-lines,
 too-many-statements,
 bad-continuation,
 line-too-long
 line-too-long,
 super-with-arguments,
 raise-missing-from,
 bad-option-value

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

3 changes: 3 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,9 @@ All notable changes to `dash` will be documented in this file.
This project adheres to [Semantic Versioning](https://semver.org/).

## [UNRELEASED]
### Changed
- [#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.

### Fixed
- [#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"

Expand Down

2 changes: 1 addition & 1 deletion
dash/testing/application_runners.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -125,7 +125,7 @@ def _stop_server():
 stopper()
 return "Flask server is shutting down"

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

4 changes: 2 additions & 2 deletions
dash/testing/browser.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -358,9 +358,9 @@ def wait_for_page(self, url=None, timeout=10):

 if self._pause:
 try:
 import pdb as pdb_
 import pdb as pdb_ # pylint: disable=import-outside-toplevel
 except ImportError:
 import ipdb as pdb_
 import ipdb as pdb_ # pylint: disable=import-outside-toplevel

 pdb_.set_trace()

Expand Down

2 changes: 1 addition & 1 deletion
dash/testing/plugin.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ def pytest_addoption(parser):
def pytest_addhooks(pluginmanager):
 # https://github.com/pytest-dev/pytest-xdist/blob/974bd566c599dc6a9ea291838c6f226197208b46/xdist/plugin.py#L67
 # avoid warnings with pytest-2.8
 from dash.testing import newhooks
 from dash.testing import newhooks # pylint: disable=import-outside-toplevel

 method = getattr(pluginmanager, "add_hookspecs", None)
 if method is None:
Expand Down

21 changes: 11 additions & 10 deletions
requires-dev.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
dash_flow_example==0.0.5
dash-dangerously-set-inner-html
isort==4.3.21
mock==4.0.1;python_version>="3.0"
isort==4.3.21;python_version<"3.7"
mock==4.0.3;python_version>="3.0"
mock==3.0.5;python_version=="2.7"
flake8==3.7.9
PyYAML==5.3
pylint==1.9.4;python_version<"3.7"
pylint==2.3.1;python_version=="3.7"
astroid==2.2.5;python_version=="3.7"
flake8==3.8.4
PyYAML==5.3.1
pylint==1.9.5;python_version<"3.7"
pylint==2.6.0;python_version>="3.7"
@Marc-Andre-RivetMarc-Andre-RivetDec 17, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we sanity test these flake8/pylint changes against the other core repos?
@Marc-Andre-RivetMarc-Andre-RivetDec 17, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They have an annoying habit of changing their rules..
@alexcjohnsonalexcjohnsonDec 17, 2020

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good call - they may well need their own updates to .pylintrc files, or syntax updates. PRs coming.
@alexcjohnsonalexcjohnsonDec 17, 2020

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

plotly/dash-core-components#907, plotly/dash-html-components#171, plotly/dash-table#857 - All three, I started with this branch, got tests passing, then reverted to the dev branch of dash and tests still pass - All that was required (other than prohibiting the latest xlrd) was a couple of linting exclusions.
astroid==2.4.2;python_version>="3.7"
black==19.10b0;python_version>="3.0"
virtualenv==20.0.10;python_version=="2.7"
fire==0.2.1
coloredlogs==14.0
virtualenv==20.2.2;python_version=="2.7"
fire==0.3.1
coloredlogs==15.0
flask-talisman==0.7.0
@alexcjohnsonalexcjohnsonDec 17, 2020

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved flask-talisman here from requires-testing because this is used in our tests themselves, not in dash.testing.

25 changes: 12 additions & 13 deletions
requires-testing.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
pytest==6.0.1;python_version>="3.0"
pytest==4.6.9;python_version=="2.7"
pytest-sugar==0.9.4
pytest-mock==3.2.0;python_version>="3.0"
pytest-mock==2.0.0;python_version=="2.7"
lxml==4.6.1
selenium==3.141.0
percy==2.0.2
cryptography==3.0
requests[security]==2.21.0
beautifulsoup4==4.8.2
waitress==1.4.3
flask-talisman==0.7.0
pytest>=6.0.2;python_version>="3.0"
pytest>=4.6,<5;python_version=="2.7"
pytest-sugar>=0.9.4
pytest-mock>=3.2.0;python_version>="3.0"
pytest-mock>=2.0.0,<3;python_version=="2.7"
lxml>=4.6.2
selenium>=3.141.0
percy>=2.0.2
requests[security]>=2.21.0
beautifulsoup4>=4.8.2,<=4.9.3;python_version=="2.7"
@alexcjohnsonalexcjohnsonDec 17, 2020

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

beautifulsoup4 has stated it's about to drop Py2 support, so I set a preemptive upper bound for Py2 at the current version.
beautifulsoup4>=4.8.2;python_version>="3.0"
waitress>=1.4.4

138 changes: 0 additions & 138 deletions
tests/integration/IntegrationTests.py

View file


Open in desktop


This file was deleted.

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Loosen testing requirements & improve testing#1506

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

alexcjohnson
merged 11 commits into

from

Dec 17, 2020
 Merged


Loosen testing requirements & improve testing
#1506
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
e0a9446

loosen testing requirements


alexcjohnson Dec 16, 2020
c3a7403

robustify cbpu001


alexcjohnson Dec 16, 2020
399373a

modernize race conditions test


alexcjohnson Dec 16, 2020
15ad7f5

update pylint exclusions for new version


alexcjohnson Dec 16, 2020
ec35ca6

reinstate isort requirement, prior to py3.7 only


alexcjohnson Dec 16, 2020
f51749a

one more update to pylint settings


alexcjohnson Dec 16, 2020
37b01bc

make test_resources work alongside other tests


alexcjohnson Dec 16, 2020
32dee50

convert remaining unittest-style tests to pytest


alexcjohnson Dec 16, 2020
2643e50

changelog for dash[testing] loosening


alexcjohnson Dec 17, 2020
8914bb3

robustify cbcx005


alexcjohnson Dec 17, 2020
c24b382

fix new parametrized test rddd002


alexcjohnson Dec 17, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
.pylintrc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,8 @@ disable=fixme,
 old-style-class,
 superfluous-parens,
 bad-continuation,
 line-too-long
 line-too-long,
 bad-option-value


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

5 changes: 4 additions & 1 deletion
.pylintrc37

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -149,7 +149,10 @@ disable=invalid-name,
 too-many-lines,
 too-many-statements,
 bad-continuation,
 line-too-long
 line-too-long,
 super-with-arguments,
 raise-missing-from,
 bad-option-value

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

3 changes: 3 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,9 @@ All notable changes to `dash` will be documented in this file.
This project adheres to [Semantic Versioning](https://semver.org/).

## [UNRELEASED]
### Changed
- [#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.

### Fixed
- [#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"

Expand Down

2 changes: 1 addition & 1 deletion
dash/testing/application_runners.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -125,7 +125,7 @@ def _stop_server():
 stopper()
 return "Flask server is shutting down"

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

4 changes: 2 additions & 2 deletions
dash/testing/browser.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -358,9 +358,9 @@ def wait_for_page(self, url=None, timeout=10):

 if self._pause:
 try:
 import pdb as pdb_
 import pdb as pdb_ # pylint: disable=import-outside-toplevel
 except ImportError:
 import ipdb as pdb_
 import ipdb as pdb_ # pylint: disable=import-outside-toplevel

 pdb_.set_trace()

Expand Down

2 changes: 1 addition & 1 deletion
dash/testing/plugin.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ def pytest_addoption(parser):
def pytest_addhooks(pluginmanager):
 # https://github.com/pytest-dev/pytest-xdist/blob/974bd566c599dc6a9ea291838c6f226197208b46/xdist/plugin.py#L67
 # avoid warnings with pytest-2.8
 from dash.testing import newhooks
 from dash.testing import newhooks # pylint: disable=import-outside-toplevel

 method = getattr(pluginmanager, "add_hookspecs", None)
 if method is None:
Expand Down

21 changes: 11 additions & 10 deletions
requires-dev.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
dash_flow_example==0.0.5
dash-dangerously-set-inner-html
isort==4.3.21
mock==4.0.1;python_version>="3.0"
isort==4.3.21;python_version<"3.7"
mock==4.0.3;python_version>="3.0"
mock==3.0.5;python_version=="2.7"
flake8==3.7.9
PyYAML==5.3
pylint==1.9.4;python_version<"3.7"
pylint==2.3.1;python_version=="3.7"
astroid==2.2.5;python_version=="3.7"
flake8==3.8.4
PyYAML==5.3.1
pylint==1.9.5;python_version<"3.7"
pylint==2.6.0;python_version>="3.7"
@Marc-Andre-RivetMarc-Andre-RivetDec 17, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we sanity test these flake8/pylint changes against the other core repos?
@Marc-Andre-RivetMarc-Andre-RivetDec 17, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They have an annoying habit of changing their rules..
@alexcjohnsonalexcjohnsonDec 17, 2020

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good call - they may well need their own updates to .pylintrc files, or syntax updates. PRs coming.
@alexcjohnsonalexcjohnsonDec 17, 2020

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

plotly/dash-core-components#907, plotly/dash-html-components#171, plotly/dash-table#857 - All three, I started with this branch, got tests passing, then reverted to the dev branch of dash and tests still pass - All that was required (other than prohibiting the latest xlrd) was a couple of linting exclusions.
astroid==2.4.2;python_version>="3.7"
black==19.10b0;python_version>="3.0"
virtualenv==20.0.10;python_version=="2.7"
fire==0.2.1
coloredlogs==14.0
virtualenv==20.2.2;python_version=="2.7"
fire==0.3.1
coloredlogs==15.0
flask-talisman==0.7.0
@alexcjohnsonalexcjohnsonDec 17, 2020

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved flask-talisman here from requires-testing because this is used in our tests themselves, not in dash.testing.

25 changes: 12 additions & 13 deletions
requires-testing.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
pytest==6.0.1;python_version>="3.0"
pytest==4.6.9;python_version=="2.7"
pytest-sugar==0.9.4
pytest-mock==3.2.0;python_version>="3.0"
pytest-mock==2.0.0;python_version=="2.7"
lxml==4.6.1
selenium==3.141.0
percy==2.0.2
cryptography==3.0
requests[security]==2.21.0
beautifulsoup4==4.8.2
waitress==1.4.3
flask-talisman==0.7.0
pytest>=6.0.2;python_version>="3.0"
pytest>=4.6,<5;python_version=="2.7"
pytest-sugar>=0.9.4
pytest-mock>=3.2.0;python_version>="3.0"
pytest-mock>=2.0.0,<3;python_version=="2.7"
lxml>=4.6.2
selenium>=3.141.0
percy>=2.0.2
requests[security]>=2.21.0
beautifulsoup4>=4.8.2,<=4.9.3;python_version=="2.7"
@alexcjohnsonalexcjohnsonDec 17, 2020

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

beautifulsoup4 has stated it's about to drop Py2 support, so I set a preemptive upper bound for Py2 at the current version.
beautifulsoup4>=4.8.2;python_version>="3.0"
waitress>=1.4.4

138 changes: 0 additions & 138 deletions
tests/integration/IntegrationTests.py

View file


Open in desktop


This file was deleted.

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Loosen testing requirements & improve testing#1506

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

alexcjohnson
merged 11 commits into

from

Dec 17, 2020
 Merged


Loosen testing requirements & improve testing
#1506
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
e0a9446

loosen testing requirements


alexcjohnson Dec 16, 2020
c3a7403

robustify cbpu001


alexcjohnson Dec 16, 2020
399373a

modernize race conditions test


alexcjohnson Dec 16, 2020
15ad7f5

update pylint exclusions for new version


alexcjohnson Dec 16, 2020
ec35ca6

reinstate isort requirement, prior to py3.7 only


alexcjohnson Dec 16, 2020
f51749a

one more update to pylint settings


alexcjohnson Dec 16, 2020
37b01bc

make test_resources work alongside other tests


alexcjohnson Dec 16, 2020
32dee50

convert remaining unittest-style tests to pytest


alexcjohnson Dec 16, 2020
2643e50

changelog for dash[testing] loosening


alexcjohnson Dec 17, 2020
8914bb3

robustify cbcx005


alexcjohnson Dec 17, 2020
c24b382

fix new parametrized test rddd002


alexcjohnson Dec 17, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
.pylintrc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,8 @@ disable=fixme,
 old-style-class,
 superfluous-parens,
 bad-continuation,
 line-too-long
 line-too-long,
 bad-option-value


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

5 changes: 4 additions & 1 deletion
.pylintrc37

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -149,7 +149,10 @@ disable=invalid-name,
 too-many-lines,
 too-many-statements,
 bad-continuation,
 line-too-long
 line-too-long,
 super-with-arguments,
 raise-missing-from,
 bad-option-value

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

3 changes: 3 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,9 @@ All notable changes to `dash` will be documented in this file.
This project adheres to [Semantic Versioning](https://semver.org/).

## [UNRELEASED]
### Changed
- [#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.

### Fixed
- [#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"

Expand Down

2 changes: 1 addition & 1 deletion
dash/testing/application_runners.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -125,7 +125,7 @@ def _stop_server():
 stopper()
 return "Flask server is shutting down"

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

4 changes: 2 additions & 2 deletions
dash/testing/browser.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -358,9 +358,9 @@ def wait_for_page(self, url=None, timeout=10):

 if self._pause:
 try:
 import pdb as pdb_
 import pdb as pdb_ # pylint: disable=import-outside-toplevel
 except ImportError:
 import ipdb as pdb_
 import ipdb as pdb_ # pylint: disable=import-outside-toplevel

 pdb_.set_trace()

Expand Down

2 changes: 1 addition & 1 deletion
dash/testing/plugin.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ def pytest_addoption(parser):
def pytest_addhooks(pluginmanager):
 # https://github.com/pytest-dev/pytest-xdist/blob/974bd566c599dc6a9ea291838c6f226197208b46/xdist/plugin.py#L67
 # avoid warnings with pytest-2.8
 from dash.testing import newhooks
 from dash.testing import newhooks # pylint: disable=import-outside-toplevel

 method = getattr(pluginmanager, "add_hookspecs", None)
 if method is None:
Expand Down

21 changes: 11 additions & 10 deletions
requires-dev.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
dash_flow_example==0.0.5
dash-dangerously-set-inner-html
isort==4.3.21
mock==4.0.1;python_version>="3.0"
isort==4.3.21;python_version<"3.7"
mock==4.0.3;python_version>="3.0"
mock==3.0.5;python_version=="2.7"
flake8==3.7.9
PyYAML==5.3
pylint==1.9.4;python_version<"3.7"
pylint==2.3.1;python_version=="3.7"
astroid==2.2.5;python_version=="3.7"
flake8==3.8.4
PyYAML==5.3.1
pylint==1.9.5;python_version<"3.7"
pylint==2.6.0;python_version>="3.7"
@Marc-Andre-RivetMarc-Andre-RivetDec 17, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we sanity test these flake8/pylint changes against the other core repos?
@Marc-Andre-RivetMarc-Andre-RivetDec 17, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They have an annoying habit of changing their rules..
@alexcjohnsonalexcjohnsonDec 17, 2020

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good call - they may well need their own updates to .pylintrc files, or syntax updates. PRs coming.
@alexcjohnsonalexcjohnsonDec 17, 2020

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

plotly/dash-core-components#907, plotly/dash-html-components#171, plotly/dash-table#857 - All three, I started with this branch, got tests passing, then reverted to the dev branch of dash and tests still pass - All that was required (other than prohibiting the latest xlrd) was a couple of linting exclusions.
astroid==2.4.2;python_version>="3.7"
black==19.10b0;python_version>="3.0"
virtualenv==20.0.10;python_version=="2.7"
fire==0.2.1
coloredlogs==14.0
virtualenv==20.2.2;python_version=="2.7"
fire==0.3.1
coloredlogs==15.0
flask-talisman==0.7.0
@alexcjohnsonalexcjohnsonDec 17, 2020

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved flask-talisman here from requires-testing because this is used in our tests themselves, not in dash.testing.

25 changes: 12 additions & 13 deletions
requires-testing.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
pytest==6.0.1;python_version>="3.0"
pytest==4.6.9;python_version=="2.7"
pytest-sugar==0.9.4
pytest-mock==3.2.0;python_version>="3.0"
pytest-mock==2.0.0;python_version=="2.7"
lxml==4.6.1
selenium==3.141.0
percy==2.0.2
cryptography==3.0
requests[security]==2.21.0
beautifulsoup4==4.8.2
waitress==1.4.3
flask-talisman==0.7.0
pytest>=6.0.2;python_version>="3.0"
pytest>=4.6,<5;python_version=="2.7"
pytest-sugar>=0.9.4
pytest-mock>=3.2.0;python_version>="3.0"
pytest-mock>=2.0.0,<3;python_version=="2.7"
lxml>=4.6.2
selenium>=3.141.0
percy>=2.0.2
requests[security]>=2.21.0
beautifulsoup4>=4.8.2,<=4.9.3;python_version=="2.7"
@alexcjohnsonalexcjohnsonDec 17, 2020

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

beautifulsoup4 has stated it's about to drop Py2 support, so I set a preemptive upper bound for Py2 at the current version.
beautifulsoup4>=4.8.2;python_version>="3.0"
waitress>=1.4.4

138 changes: 0 additions & 138 deletions
tests/integration/IntegrationTests.py

View file


Open in desktop


This file was deleted.

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Loosen testing requirements & improve testing#1506

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

alexcjohnson
merged 11 commits into

from

Dec 17, 2020
 Merged


Loosen testing requirements & improve testing
#1506
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
e0a9446

loosen testing requirements


alexcjohnson Dec 16, 2020
c3a7403

robustify cbpu001


alexcjohnson Dec 16, 2020
399373a

modernize race conditions test


alexcjohnson Dec 16, 2020
15ad7f5

update pylint exclusions for new version


alexcjohnson Dec 16, 2020
ec35ca6

reinstate isort requirement, prior to py3.7 only


alexcjohnson Dec 16, 2020
f51749a

one more update to pylint settings


alexcjohnson Dec 16, 2020
37b01bc

make test_resources work alongside other tests


alexcjohnson Dec 16, 2020
32dee50

convert remaining unittest-style tests to pytest


alexcjohnson Dec 16, 2020
2643e50

changelog for dash[testing] loosening


alexcjohnson Dec 17, 2020
8914bb3

robustify cbcx005


alexcjohnson Dec 17, 2020
c24b382

fix new parametrized test rddd002


alexcjohnson Dec 17, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
.pylintrc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,8 @@ disable=fixme,
 old-style-class,
 superfluous-parens,
 bad-continuation,
 line-too-long
 line-too-long,
 bad-option-value


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

5 changes: 4 additions & 1 deletion
.pylintrc37

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -149,7 +149,10 @@ disable=invalid-name,
 too-many-lines,
 too-many-statements,
 bad-continuation,
 line-too-long
 line-too-long,
 super-with-arguments,
 raise-missing-from,
 bad-option-value

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

3 changes: 3 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,9 @@ All notable changes to `dash` will be documented in this file.
This project adheres to [Semantic Versioning](https://semver.org/).

## [UNRELEASED]
### Changed
- [#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.

### Fixed
- [#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"

Expand Down

2 changes: 1 addition & 1 deletion
dash/testing/application_runners.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -125,7 +125,7 @@ def _stop_server():
 stopper()
 return "Flask server is shutting down"

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

4 changes: 2 additions & 2 deletions
dash/testing/browser.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -358,9 +358,9 @@ def wait_for_page(self, url=None, timeout=10):

 if self._pause:
 try:
 import pdb as pdb_
 import pdb as pdb_ # pylint: disable=import-outside-toplevel
 except ImportError:
 import ipdb as pdb_
 import ipdb as pdb_ # pylint: disable=import-outside-toplevel

 pdb_.set_trace()

Expand Down

2 changes: 1 addition & 1 deletion
dash/testing/plugin.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ def pytest_addoption(parser):
def pytest_addhooks(pluginmanager):
 # https://github.com/pytest-dev/pytest-xdist/blob/974bd566c599dc6a9ea291838c6f226197208b46/xdist/plugin.py#L67
 # avoid warnings with pytest-2.8
 from dash.testing import newhooks
 from dash.testing import newhooks # pylint: disable=import-outside-toplevel

 method = getattr(pluginmanager, "add_hookspecs", None)
 if method is None:
Expand Down

21 changes: 11 additions & 10 deletions
requires-dev.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
dash_flow_example==0.0.5
dash-dangerously-set-inner-html
isort==4.3.21
mock==4.0.1;python_version>="3.0"
isort==4.3.21;python_version<"3.7"
mock==4.0.3;python_version>="3.0"
mock==3.0.5;python_version=="2.7"
flake8==3.7.9
PyYAML==5.3
pylint==1.9.4;python_version<"3.7"
pylint==2.3.1;python_version=="3.7"
astroid==2.2.5;python_version=="3.7"
flake8==3.8.4
PyYAML==5.3.1
pylint==1.9.5;python_version<"3.7"
pylint==2.6.0;python_version>="3.7"
@Marc-Andre-RivetMarc-Andre-RivetDec 17, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we sanity test these flake8/pylint changes against the other core repos?
@Marc-Andre-RivetMarc-Andre-RivetDec 17, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They have an annoying habit of changing their rules..
@alexcjohnsonalexcjohnsonDec 17, 2020

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good call - they may well need their own updates to .pylintrc files, or syntax updates. PRs coming.
@alexcjohnsonalexcjohnsonDec 17, 2020

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

plotly/dash-core-components#907, plotly/dash-html-components#171, plotly/dash-table#857 - All three, I started with this branch, got tests passing, then reverted to the dev branch of dash and tests still pass - All that was required (other than prohibiting the latest xlrd) was a couple of linting exclusions.
astroid==2.4.2;python_version>="3.7"
black==19.10b0;python_version>="3.0"
virtualenv==20.0.10;python_version=="2.7"
fire==0.2.1
coloredlogs==14.0
virtualenv==20.2.2;python_version=="2.7"
fire==0.3.1
coloredlogs==15.0
flask-talisman==0.7.0
@alexcjohnsonalexcjohnsonDec 17, 2020

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved flask-talisman here from requires-testing because this is used in our tests themselves, not in dash.testing.

25 changes: 12 additions & 13 deletions
requires-testing.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
pytest==6.0.1;python_version>="3.0"
pytest==4.6.9;python_version=="2.7"
pytest-sugar==0.9.4
pytest-mock==3.2.0;python_version>="3.0"
pytest-mock==2.0.0;python_version=="2.7"
lxml==4.6.1
selenium==3.141.0
percy==2.0.2
cryptography==3.0
requests[security]==2.21.0
beautifulsoup4==4.8.2
waitress==1.4.3
flask-talisman==0.7.0
pytest>=6.0.2;python_version>="3.0"
pytest>=4.6,<5;python_version=="2.7"
pytest-sugar>=0.9.4
pytest-mock>=3.2.0;python_version>="3.0"
pytest-mock>=2.0.0,<3;python_version=="2.7"
lxml>=4.6.2
selenium>=3.141.0
percy>=2.0.2
requests[security]>=2.21.0
beautifulsoup4>=4.8.2,<=4.9.3;python_version=="2.7"
@alexcjohnsonalexcjohnsonDec 17, 2020

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

beautifulsoup4 has stated it's about to drop Py2 support, so I set a preemptive upper bound for Py2 at the current version.
beautifulsoup4>=4.8.2;python_version>="3.0"
waitress>=1.4.4

138 changes: 0 additions & 138 deletions
tests/integration/IntegrationTests.py

View file


Open in desktop


This file was deleted.

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Loosen testing requirements & improve testing#1506

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

alexcjohnson
merged 11 commits into

from

Dec 17, 2020
 Merged


Loosen testing requirements & improve testing
#1506
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
e0a9446

loosen testing requirements


alexcjohnson Dec 16, 2020
c3a7403

robustify cbpu001


alexcjohnson Dec 16, 2020
399373a

modernize race conditions test


alexcjohnson Dec 16, 2020
15ad7f5

update pylint exclusions for new version


alexcjohnson Dec 16, 2020
ec35ca6

reinstate isort requirement, prior to py3.7 only


alexcjohnson Dec 16, 2020
f51749a

one more update to pylint settings


alexcjohnson Dec 16, 2020
37b01bc

make test_resources work alongside other tests


alexcjohnson Dec 16, 2020
32dee50

convert remaining unittest-style tests to pytest


alexcjohnson Dec 16, 2020
2643e50

changelog for dash[testing] loosening


alexcjohnson Dec 17, 2020
8914bb3

robustify cbcx005


alexcjohnson Dec 17, 2020
c24b382

fix new parametrized test rddd002


alexcjohnson Dec 17, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
.pylintrc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,8 @@ disable=fixme,
 old-style-class,
 superfluous-parens,
 bad-continuation,
 line-too-long
 line-too-long,
 bad-option-value


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

5 changes: 4 additions & 1 deletion
.pylintrc37

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -149,7 +149,10 @@ disable=invalid-name,
 too-many-lines,
 too-many-statements,
 bad-continuation,
 line-too-long
 line-too-long,
 super-with-arguments,
 raise-missing-from,
 bad-option-value

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

3 changes: 3 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,9 @@ All notable changes to `dash` will be documented in this file.
This project adheres to [Semantic Versioning](https://semver.org/).

## [UNRELEASED]
### Changed
- [#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.

### Fixed
- [#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"

Expand Down

2 changes: 1 addition & 1 deletion
dash/testing/application_runners.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -125,7 +125,7 @@ def _stop_server():
 stopper()
 return "Flask server is shutting down"

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

4 changes: 2 additions & 2 deletions
dash/testing/browser.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -358,9 +358,9 @@ def wait_for_page(self, url=None, timeout=10):

 if self._pause:
 try:
 import pdb as pdb_
 import pdb as pdb_ # pylint: disable=import-outside-toplevel
 except ImportError:
 import ipdb as pdb_
 import ipdb as pdb_ # pylint: disable=import-outside-toplevel

 pdb_.set_trace()

Expand Down

2 changes: 1 addition & 1 deletion
dash/testing/plugin.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ def pytest_addoption(parser):
def pytest_addhooks(pluginmanager):
 # https://github.com/pytest-dev/pytest-xdist/blob/974bd566c599dc6a9ea291838c6f226197208b46/xdist/plugin.py#L67
 # avoid warnings with pytest-2.8
 from dash.testing import newhooks
 from dash.testing import newhooks # pylint: disable=import-outside-toplevel

 method = getattr(pluginmanager, "add_hookspecs", None)
 if method is None:
Expand Down

21 changes: 11 additions & 10 deletions
requires-dev.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
dash_flow_example==0.0.5
dash-dangerously-set-inner-html
isort==4.3.21
mock==4.0.1;python_version>="3.0"
isort==4.3.21;python_version<"3.7"
mock==4.0.3;python_version>="3.0"
mock==3.0.5;python_version=="2.7"
flake8==3.7.9
PyYAML==5.3
pylint==1.9.4;python_version<"3.7"
pylint==2.3.1;python_version=="3.7"
astroid==2.2.5;python_version=="3.7"
flake8==3.8.4
PyYAML==5.3.1
pylint==1.9.5;python_version<"3.7"
pylint==2.6.0;python_version>="3.7"
@Marc-Andre-RivetMarc-Andre-RivetDec 17, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we sanity test these flake8/pylint changes against the other core repos?
@Marc-Andre-RivetMarc-Andre-RivetDec 17, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They have an annoying habit of changing their rules..
@alexcjohnsonalexcjohnsonDec 17, 2020

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good call - they may well need their own updates to .pylintrc files, or syntax updates. PRs coming.
@alexcjohnsonalexcjohnsonDec 17, 2020

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

plotly/dash-core-components#907, plotly/dash-html-components#171, plotly/dash-table#857 - All three, I started with this branch, got tests passing, then reverted to the dev branch of dash and tests still pass - All that was required (other than prohibiting the latest xlrd) was a couple of linting exclusions.
astroid==2.4.2;python_version>="3.7"
black==19.10b0;python_version>="3.0"
virtualenv==20.0.10;python_version=="2.7"
fire==0.2.1
coloredlogs==14.0
virtualenv==20.2.2;python_version=="2.7"
fire==0.3.1
coloredlogs==15.0
flask-talisman==0.7.0
@alexcjohnsonalexcjohnsonDec 17, 2020

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved flask-talisman here from requires-testing because this is used in our tests themselves, not in dash.testing.

25 changes: 12 additions & 13 deletions
requires-testing.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
pytest==6.0.1;python_version>="3.0"
pytest==4.6.9;python_version=="2.7"
pytest-sugar==0.9.4
pytest-mock==3.2.0;python_version>="3.0"
pytest-mock==2.0.0;python_version=="2.7"
lxml==4.6.1
selenium==3.141.0
percy==2.0.2
cryptography==3.0
requests[security]==2.21.0
beautifulsoup4==4.8.2
waitress==1.4.3
flask-talisman==0.7.0
pytest>=6.0.2;python_version>="3.0"
pytest>=4.6,<5;python_version=="2.7"
pytest-sugar>=0.9.4
pytest-mock>=3.2.0;python_version>="3.0"
pytest-mock>=2.0.0,<3;python_version=="2.7"
lxml>=4.6.2
selenium>=3.141.0
percy>=2.0.2
requests[security]>=2.21.0
beautifulsoup4>=4.8.2,<=4.9.3;python_version=="2.7"
@alexcjohnsonalexcjohnsonDec 17, 2020

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

beautifulsoup4 has stated it's about to drop Py2 support, so I set a preemptive upper bound for Py2 at the current version.
beautifulsoup4>=4.8.2;python_version>="3.0"
waitress>=1.4.4

138 changes: 0 additions & 138 deletions
tests/integration/IntegrationTests.py

View file


Open in desktop


This file was deleted.

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Loosen testing requirements & improve testing#1506

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

alexcjohnson
merged 11 commits into

from

Dec 17, 2020
 Merged


Loosen testing requirements & improve testing
#1506
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
e0a9446

loosen testing requirements


alexcjohnson Dec 16, 2020
c3a7403

robustify cbpu001


alexcjohnson Dec 16, 2020
399373a

modernize race conditions test


alexcjohnson Dec 16, 2020
15ad7f5

update pylint exclusions for new version


alexcjohnson Dec 16, 2020
ec35ca6

reinstate isort requirement, prior to py3.7 only


alexcjohnson Dec 16, 2020
f51749a

one more update to pylint settings


alexcjohnson Dec 16, 2020
37b01bc

make test_resources work alongside other tests


alexcjohnson Dec 16, 2020
32dee50

convert remaining unittest-style tests to pytest


alexcjohnson Dec 16, 2020
2643e50

changelog for dash[testing] loosening


alexcjohnson Dec 17, 2020
8914bb3

robustify cbcx005


alexcjohnson Dec 17, 2020
c24b382

fix new parametrized test rddd002


alexcjohnson Dec 17, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
.pylintrc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,8 @@ disable=fixme,
 old-style-class,
 superfluous-parens,
 bad-continuation,
 line-too-long
 line-too-long,
 bad-option-value


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

5 changes: 4 additions & 1 deletion
.pylintrc37

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -149,7 +149,10 @@ disable=invalid-name,
 too-many-lines,
 too-many-statements,
 bad-continuation,
 line-too-long
 line-too-long,
 super-with-arguments,
 raise-missing-from,
 bad-option-value

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

3 changes: 3 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,9 @@ All notable changes to `dash` will be documented in this file.
This project adheres to [Semantic Versioning](https://semver.org/).

## [UNRELEASED]
### Changed
- [#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.

### Fixed
- [#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"

Expand Down

2 changes: 1 addition & 1 deletion
dash/testing/application_runners.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -125,7 +125,7 @@ def _stop_server():
 stopper()
 return "Flask server is shutting down"

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

4 changes: 2 additions & 2 deletions
dash/testing/browser.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -358,9 +358,9 @@ def wait_for_page(self, url=None, timeout=10):

 if self._pause:
 try:
 import pdb as pdb_
 import pdb as pdb_ # pylint: disable=import-outside-toplevel
 except ImportError:
 import ipdb as pdb_
 import ipdb as pdb_ # pylint: disable=import-outside-toplevel

 pdb_.set_trace()

Expand Down

2 changes: 1 addition & 1 deletion
dash/testing/plugin.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ def pytest_addoption(parser):
def pytest_addhooks(pluginmanager):
 # https://github.com/pytest-dev/pytest-xdist/blob/974bd566c599dc6a9ea291838c6f226197208b46/xdist/plugin.py#L67
 # avoid warnings with pytest-2.8
 from dash.testing import newhooks
 from dash.testing import newhooks # pylint: disable=import-outside-toplevel

 method = getattr(pluginmanager, "add_hookspecs", None)
 if method is None:
Expand Down

21 changes: 11 additions & 10 deletions
requires-dev.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
dash_flow_example==0.0.5
dash-dangerously-set-inner-html
isort==4.3.21
mock==4.0.1;python_version>="3.0"
isort==4.3.21;python_version<"3.7"
mock==4.0.3;python_version>="3.0"
mock==3.0.5;python_version=="2.7"
flake8==3.7.9
PyYAML==5.3
pylint==1.9.4;python_version<"3.7"
pylint==2.3.1;python_version=="3.7"
astroid==2.2.5;python_version=="3.7"
flake8==3.8.4
PyYAML==5.3.1
pylint==1.9.5;python_version<"3.7"
pylint==2.6.0;python_version>="3.7"
@Marc-Andre-RivetMarc-Andre-RivetDec 17, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we sanity test these flake8/pylint changes against the other core repos?
@Marc-Andre-RivetMarc-Andre-RivetDec 17, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They have an annoying habit of changing their rules..
@alexcjohnsonalexcjohnsonDec 17, 2020

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good call - they may well need their own updates to .pylintrc files, or syntax updates. PRs coming.
@alexcjohnsonalexcjohnsonDec 17, 2020

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

plotly/dash-core-components#907, plotly/dash-html-components#171, plotly/dash-table#857 - All three, I started with this branch, got tests passing, then reverted to the dev branch of dash and tests still pass - All that was required (other than prohibiting the latest xlrd) was a couple of linting exclusions.
astroid==2.4.2;python_version>="3.7"
black==19.10b0;python_version>="3.0"
virtualenv==20.0.10;python_version=="2.7"
fire==0.2.1
coloredlogs==14.0
virtualenv==20.2.2;python_version=="2.7"
fire==0.3.1
coloredlogs==15.0
flask-talisman==0.7.0
@alexcjohnsonalexcjohnsonDec 17, 2020

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved flask-talisman here from requires-testing because this is used in our tests themselves, not in dash.testing.

25 changes: 12 additions & 13 deletions
requires-testing.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
pytest==6.0.1;python_version>="3.0"
pytest==4.6.9;python_version=="2.7"
pytest-sugar==0.9.4
pytest-mock==3.2.0;python_version>="3.0"
pytest-mock==2.0.0;python_version=="2.7"
lxml==4.6.1
selenium==3.141.0
percy==2.0.2
cryptography==3.0
requests[security]==2.21.0
beautifulsoup4==4.8.2
waitress==1.4.3
flask-talisman==0.7.0
pytest>=6.0.2;python_version>="3.0"
pytest>=4.6,<5;python_version=="2.7"
pytest-sugar>=0.9.4
pytest-mock>=3.2.0;python_version>="3.0"
pytest-mock>=2.0.0,<3;python_version=="2.7"
lxml>=4.6.2
selenium>=3.141.0
percy>=2.0.2
requests[security]>=2.21.0
beautifulsoup4>=4.8.2,<=4.9.3;python_version=="2.7"
@alexcjohnsonalexcjohnsonDec 17, 2020

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

beautifulsoup4 has stated it's about to drop Py2 support, so I set a preemptive upper bound for Py2 at the current version.
beautifulsoup4>=4.8.2;python_version>="3.0"
waitress>=1.4.4

138 changes: 0 additions & 138 deletions
tests/integration/IntegrationTests.py

View file


Open in desktop


This file was deleted.

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Loosen testing requirements & improve testing#1506

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

alexcjohnson
merged 11 commits into

from

Dec 17, 2020
 Merged


Loosen testing requirements & improve testing
#1506
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
e0a9446

loosen testing requirements


alexcjohnson Dec 16, 2020
c3a7403

robustify cbpu001


alexcjohnson Dec 16, 2020
399373a

modernize race conditions test


alexcjohnson Dec 16, 2020
15ad7f5

update pylint exclusions for new version


alexcjohnson Dec 16, 2020
ec35ca6

reinstate isort requirement, prior to py3.7 only


alexcjohnson Dec 16, 2020
f51749a

one more update to pylint settings


alexcjohnson Dec 16, 2020
37b01bc

make test_resources work alongside other tests


alexcjohnson Dec 16, 2020
32dee50

convert remaining unittest-style tests to pytest


alexcjohnson Dec 16, 2020
2643e50

changelog for dash[testing] loosening


alexcjohnson Dec 17, 2020
8914bb3

robustify cbcx005


alexcjohnson Dec 17, 2020
c24b382

fix new parametrized test rddd002


alexcjohnson Dec 17, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
.pylintrc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,8 @@ disable=fixme,
 old-style-class,
 superfluous-parens,
 bad-continuation,
 line-too-long
 line-too-long,
 bad-option-value


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

5 changes: 4 additions & 1 deletion
.pylintrc37

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -149,7 +149,10 @@ disable=invalid-name,
 too-many-lines,
 too-many-statements,
 bad-continuation,
 line-too-long
 line-too-long,
 super-with-arguments,
 raise-missing-from,
 bad-option-value

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

3 changes: 3 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,9 @@ All notable changes to `dash` will be documented in this file.
This project adheres to [Semantic Versioning](https://semver.org/).

## [UNRELEASED]
### Changed
- [#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.

### Fixed
- [#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"

Expand Down

2 changes: 1 addition & 1 deletion
dash/testing/application_runners.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -125,7 +125,7 @@ def _stop_server():
 stopper()
 return "Flask server is shutting down"

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

4 changes: 2 additions & 2 deletions
dash/testing/browser.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -358,9 +358,9 @@ def wait_for_page(self, url=None, timeout=10):

 if self._pause:
 try:
 import pdb as pdb_
 import pdb as pdb_ # pylint: disable=import-outside-toplevel
 except ImportError:
 import ipdb as pdb_
 import ipdb as pdb_ # pylint: disable=import-outside-toplevel

 pdb_.set_trace()

Expand Down

2 changes: 1 addition & 1 deletion
dash/testing/plugin.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ def pytest_addoption(parser):
def pytest_addhooks(pluginmanager):
 # https://github.com/pytest-dev/pytest-xdist/blob/974bd566c599dc6a9ea291838c6f226197208b46/xdist/plugin.py#L67
 # avoid warnings with pytest-2.8
 from dash.testing import newhooks
 from dash.testing import newhooks # pylint: disable=import-outside-toplevel

 method = getattr(pluginmanager, "add_hookspecs", None)
 if method is None:
Expand Down

21 changes: 11 additions & 10 deletions
requires-dev.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
dash_flow_example==0.0.5
dash-dangerously-set-inner-html
isort==4.3.21
mock==4.0.1;python_version>="3.0"
isort==4.3.21;python_version<"3.7"
mock==4.0.3;python_version>="3.0"
mock==3.0.5;python_version=="2.7"
flake8==3.7.9
PyYAML==5.3
pylint==1.9.4;python_version<"3.7"
pylint==2.3.1;python_version=="3.7"
astroid==2.2.5;python_version=="3.7"
flake8==3.8.4
PyYAML==5.3.1
pylint==1.9.5;python_version<"3.7"
pylint==2.6.0;python_version>="3.7"
@Marc-Andre-RivetMarc-Andre-RivetDec 17, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we sanity test these flake8/pylint changes against the other core repos?
@Marc-Andre-RivetMarc-Andre-RivetDec 17, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They have an annoying habit of changing their rules..
@alexcjohnsonalexcjohnsonDec 17, 2020

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good call - they may well need their own updates to .pylintrc files, or syntax updates. PRs coming.
@alexcjohnsonalexcjohnsonDec 17, 2020

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

plotly/dash-core-components#907, plotly/dash-html-components#171, plotly/dash-table#857 - All three, I started with this branch, got tests passing, then reverted to the dev branch of dash and tests still pass - All that was required (other than prohibiting the latest xlrd) was a couple of linting exclusions.
astroid==2.4.2;python_version>="3.7"
black==19.10b0;python_version>="3.0"
virtualenv==20.0.10;python_version=="2.7"
fire==0.2.1
coloredlogs==14.0
virtualenv==20.2.2;python_version=="2.7"
fire==0.3.1
coloredlogs==15.0
flask-talisman==0.7.0
@alexcjohnsonalexcjohnsonDec 17, 2020

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved flask-talisman here from requires-testing because this is used in our tests themselves, not in dash.testing.

25 changes: 12 additions & 13 deletions
requires-testing.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
pytest==6.0.1;python_version>="3.0"
pytest==4.6.9;python_version=="2.7"
pytest-sugar==0.9.4
pytest-mock==3.2.0;python_version>="3.0"
pytest-mock==2.0.0;python_version=="2.7"
lxml==4.6.1
selenium==3.141.0
percy==2.0.2
cryptography==3.0
requests[security]==2.21.0
beautifulsoup4==4.8.2
waitress==1.4.3
flask-talisman==0.7.0
pytest>=6.0.2;python_version>="3.0"
pytest>=4.6,<5;python_version=="2.7"
pytest-sugar>=0.9.4
pytest-mock>=3.2.0;python_version>="3.0"
pytest-mock>=2.0.0,<3;python_version=="2.7"
lxml>=4.6.2
selenium>=3.141.0
percy>=2.0.2
requests[security]>=2.21.0
beautifulsoup4>=4.8.2,<=4.9.3;python_version=="2.7"
@alexcjohnsonalexcjohnsonDec 17, 2020

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

beautifulsoup4 has stated it's about to drop Py2 support, so I set a preemptive upper bound for Py2 at the current version.
beautifulsoup4>=4.8.2;python_version>="3.0"
waitress>=1.4.4

138 changes: 0 additions & 138 deletions
tests/integration/IntegrationTests.py

View file


Open in desktop


This file was deleted.

Loading