Skip to content

Commit 7a1dffc

Browse files
authored
Merge pull request #758 from seleniumbase/update-dependencies
Update Python dependencies
2 parents 8cfa0dc + 906d449 commit 7a1dffc

File tree

7 files changed

+76
-12
lines changed

7 files changed

+76
-12
lines changed

README.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ Additionally, you can host your own SeleniumBase Dashboard Server on a port of y
499499
python -m http.server 1948
500500
```
501501
502-
Now you can navigate to ``http://localhost:1948/dashboard.html`` in order to view the dashboard as a web app. This requires two different terminal windows: one for running the server, and another for running the tests, which should be run from the same directory.
502+
Now you can navigate to ``http://localhost:1948/dashboard.html`` in order to view the dashboard as a web app. This requires two different terminal windows: one for running the server, and another for running the tests, which should be run from the same directory. (Use ``CTRL-C`` to stop the http server.)
503503
504504
Here's a full example of what the SeleniumBase Dashboard may look like:
505505
@@ -526,6 +526,14 @@ pytest test_suite.py --html=report.html
526526
527527
When combining pytest html reports with SeleniumBase Dashboard usage, the pie chart from the Dashboard will get added to the html report. Additionally, if you set the html report URL to be the same as the Dashboard URL when also using the dashboard, (example: ``--dashboard --html=dashboard.html``), then the Dashboard will become an advanced html report when all the tests complete.
528528
529+
Here's an example of an upgraded html report:
530+
531+
```bash
532+
pytest test_suite.py --dashboard --html=report.html
533+
```
534+
535+
<img src="https://seleniumbase.io/cdn/img/dash_report.jpg" alt="Dashboard Pytest HTML Report" title="Dashboard Pytest HTML Report" width="520" />
536+
529537
If viewing pytest html reports in [Jenkins](https://www.jenkins.io/), you may need to [configure Jenkins settings](https://stackoverflow.com/a/46197356) for the html to render correctly. This is due to [Jenkins CSP changes](https://www.jenkins.io/doc/book/system-administration/security/configuring-content-security-policy/).
530538
531539
You can also use ``--junit-xml=report.xml`` to get an xml report instead. Jenkins can use this file to display better reporting for your tests.

examples/example_logs/ReadMe.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Additionally, you can host your own SeleniumBase Dashboard Server on a port of y
3737
python -m http.server 1948
3838
```
3939

40-
Now you can navigate to ``http://localhost:1948/dashboard.html`` in order to view the dashboard as a web app. This requires two different terminal windows: one for running the server, and another for running the tests, which should be run from the same directory.
40+
Now you can navigate to ``http://localhost:1948/dashboard.html`` in order to view the dashboard as a web app. This requires two different terminal windows: one for running the server, and another for running the tests, which should be run from the same directory. (Use ``CTRL-C`` to stop the http server.)
4141

4242
Here's a full example of what the SeleniumBase Dashboard may look like:
4343

@@ -61,6 +61,14 @@ pytest test_suite.py --html=report.html
6161

6262
When combining pytest html reports with SeleniumBase Dashboard usage, the pie chart from the Dashboard will get added to the html report. Additionally, if you set the html report URL to be the same as the Dashboard URL when also using the dashboard, (example: ``--dashboard --html=dashboard.html``), then the Dashboard will become an advanced html report when all the tests complete.
6363

64+
Here's an example of an upgraded html report:
65+
66+
```bash
67+
pytest test_suite.py --dashboard --html=report.html
68+
```
69+
70+
<img src="https://seleniumbase.io/cdn/img/dash_report.jpg" alt="Dashboard Pytest HTML Report" title="Dashboard Pytest HTML Report" width="520" />
71+
6472
If viewing pytest html reports in [Jenkins](https://www.jenkins.io/), you may need to [configure Jenkins settings](https://stackoverflow.com/a/46197356) for the html to render correctly. This is due to [Jenkins CSP changes](https://www.jenkins.io/doc/book/system-administration/security/configuring-content-security-policy/).
6573

6674
You can also use ``--junit-xml=report.xml`` to get an xml report instead. Jenkins can use this file to display better reporting for your tests.

examples/translations/pytest.ini

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
[pytest]
2+
3+
# Let console output be seen. Don't override the pytest plugin.
4+
addopts = --capture=no --ignore conftest.py -p no:cacheprovider
5+
6+
# Ignore warnings such as DeprecationWarning and pytest.PytestUnknownMarkWarning
7+
filterwarnings =
8+
ignore::pytest.PytestWarning
9+
ignore:.*U.*mode is deprecated:DeprecationWarning
10+
11+
# Configure the junit_family option explicitly:
12+
junit_family = legacy
13+
14+
# Set pytest discovery rules:
15+
# (Most of the rules here are similar to the default rules.)
16+
# (unittest.TestCase rules override the rules here for classes and functions.)
17+
python_files = test_*.py *_test.py *_tests.py *_suite.py *_test_*.py
18+
python_classes = Test* *Test* *Test *Tests *Suite
19+
python_functions = test_*
20+
21+
# Here are the pytest markers used in the example tests:
22+
# (pytest v4.5.0 and newer requires marker registration to prevent warnings.)
23+
# (Future versions of pytest may turn those marker warnings into errors.)
24+
markers =
25+
marker1: custom marker
26+
marker2: custom marker
27+
marker3: custom marker
28+
marker_test_suite: custom marker
29+
expected_failure: custom marker
30+
local: custom marker
31+
remote: custom marker
32+
offline: custom marker
33+
develop: custom marker
34+
qa: custom marker
35+
ready: custom marker
36+
active: custom marker
37+
master: custom marker
38+
release: custom marker
39+
staging: custom marker
40+
production: custom marker

help_docs/customizing_test_runs.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ Additionally, you can host your own SeleniumBase Dashboard Server on a port of y
275275
python -m http.server 1948
276276
```
277277

278-
Now you can navigate to ``http://localhost:1948/dashboard.html`` in order to view the dashboard as a web app. This requires two different terminal windows: one for running the server, and another for running the tests, which should be run from the same directory.
278+
Now you can navigate to ``http://localhost:1948/dashboard.html`` in order to view the dashboard as a web app. This requires two different terminal windows: one for running the server, and another for running the tests, which should be run from the same directory. (Use ``CTRL-C`` to stop the http server.)
279279

280280
Here's a full example of what the SeleniumBase Dashboard may look like:
281281

@@ -299,6 +299,14 @@ pytest test_suite.py --html=report.html
299299

300300
When combining pytest html reports with SeleniumBase Dashboard usage, the pie chart from the Dashboard will get added to the html report. Additionally, if you set the html report URL to be the same as the Dashboard URL when also using the dashboard, (example: ``--dashboard --html=dashboard.html``), then the Dashboard will become an advanced html report when all the tests complete.
301301

302+
Here's an example of an upgraded html report:
303+
304+
```bash
305+
pytest test_suite.py --dashboard --html=report.html
306+
```
307+
308+
<img src="https://seleniumbase.io/cdn/img/dash_report.jpg" alt="Dashboard Pytest HTML Report" title="Dashboard Pytest HTML Report" width="520" />
309+
302310
If viewing pytest html reports in [Jenkins](https://www.jenkins.io/), you may need to [configure Jenkins settings](https://stackoverflow.com/a/46197356) for the html to render correctly. This is due to [Jenkins CSP changes](https://www.jenkins.io/doc/book/system-administration/security/configuring-content-security-policy/).
303311

304312
You can also use ``--junit-xml=report.xml`` to get an xml report instead. Jenkins can use this file to display better reporting for your tests.

requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ pip>=20.3.3
22
packaging>=20.8
33
setuptools>=44.1.1;python_version<"3.5"
44
setuptools>=50.3.2;python_version>="3.5" and python_version<"3.6"
5-
setuptools>=51.0.0;python_version>="3.6"
5+
setuptools>=51.1.0;python_version>="3.6"
66
setuptools-scm>=5.0.1
77
wheel>=0.36.2
88
attrs>=20.3.0
@@ -82,6 +82,6 @@ pyflakes==2.2.0;python_version>="3.5"
8282
tornado==5.1.1;python_version<"3.5"
8383
tornado==6.1;python_version>="3.5"
8484
allure-pytest==2.8.22;python_version<"3.5"
85-
allure-pytest==2.8.24;python_version>="3.5"
85+
allure-pytest==2.8.29;python_version>="3.5"
8686
pdfminer.six==20191110;python_version<"3.5"
8787
pdfminer.six==20201018;python_version>="3.5"

seleniumbase/__version__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# seleniumbase package
2-
__version__ = "1.51.3"
2+
__version__ = "1.51.4"

setup.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,14 +106,14 @@
106106
'packaging>=20.8',
107107
'setuptools>=44.1.1;python_version<"3.5"',
108108
'setuptools>=50.3.2;python_version>="3.5" and python_version<"3.6"',
109-
'setuptools>=51.0.0;python_version>="3.6"',
110-
'setuptools-scm',
109+
'setuptools>=51.1.0;python_version>="3.6"',
110+
'setuptools-scm>=5.0.1',
111111
'wheel>=0.36.2',
112112
'attrs>=20.3.0',
113113
'certifi>=2020.12.5',
114-
'six',
115-
'nose',
116-
'ipdb',
114+
'six==1.15.0',
115+
'nose==1.3.7',
116+
'ipdb==0.13.4',
117117
'parso==0.7.1', # The last version for Python 2 and 3.5
118118
'jedi==0.17.2', # The last version for Python 2 and 3.5
119119
'idna==2.10', # Must stay in sync with "requests"
@@ -186,7 +186,7 @@
186186
'tornado==5.1.1;python_version<"3.5"',
187187
'tornado==6.1;python_version>="3.5"',
188188
'allure-pytest==2.8.22;python_version<"3.5"',
189-
'allure-pytest==2.8.24;python_version>="3.5"',
189+
'allure-pytest==2.8.29;python_version>="3.5"',
190190
'pdfminer.six==20191110;python_version<"3.5"',
191191
'pdfminer.six==20201018;python_version>="3.5"',
192192
],

0 commit comments

Comments
 (0)