From 75f9a0e0ee7f52182385cfac5995c1cb5d048b38 Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Thu, 12 Nov 2020 00:55:20 -0500 Subject: [PATCH 1/4] Update Python dependencies --- requirements.txt | 11 ++++++----- setup.py | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/requirements.txt b/requirements.txt index 03be18fcd58..77cd3f856f5 100755 --- a/requirements.txt +++ b/requirements.txt @@ -4,6 +4,8 @@ setuptools>=44.1.1;python_version<"3.5" setuptools>=50.3.2;python_version>="3.5" setuptools-scm>=4.1.2 wheel>=0.35.1 +attrs>=20.3.0 +certifi>=2020.11.8 six==1.15.0 nose==1.3.7 ipdb==0.13.4 @@ -11,15 +13,14 @@ parso==0.7.1 jedi==0.17.2 idna==2.10 chardet==3.0.4 -urllib3==1.25.11 -requests==2.24.0 +urllib3==1.26.1 +requests==2.25.0 selenium==3.141.0 msedge-selenium-tools==3.141.2 more-itertools==5.0.0;python_version<"3.5" more-itertools==8.6.0;python_version>="3.5" cssselect==1.1.0 pluggy==0.13.1 -attrs>=20.2.0 py==1.8.1;python_version<"3.5" py==1.9.0;python_version>="3.5" pytest==4.6.11;python_version<"3.5" @@ -62,7 +63,8 @@ brython==3.9.0 pyotp==2.4.1 boto==2.49.0 cffi==1.14.3 -rich==9.1.0;python_version>="3.6" and python_version<"4.0" +toml==0.10.2 +rich==9.2.0;python_version>="3.6" and python_version<"4.0" zipp==1.2.0;python_version<"3.6" zipp==3.4.0;python_version>="3.6" flake8==3.7.9;python_version<"3.5" @@ -71,7 +73,6 @@ pyflakes==2.1.1;python_version<"3.5" pyflakes==2.2.0;python_version>="3.5" tornado==5.1.1;python_version<"3.5" tornado==6.1;python_version>="3.5" -certifi>=2020.6.20 allure-pytest==2.8.19 pdfminer.six==20191110;python_version<"3.5" pdfminer.six==20201018;python_version>="3.5" diff --git a/setup.py b/setup.py index c3d3cff823d..2b023fbd531 100755 --- a/setup.py +++ b/setup.py @@ -108,6 +108,8 @@ 'setuptools>=50.3.2;python_version>="3.5"', 'setuptools-scm', 'wheel>=0.35.1', + 'attrs>=20.3.0', + 'certifi>=2020.11.8', 'six', 'nose', 'ipdb', @@ -115,15 +117,14 @@ 'jedi==0.17.2', # The last version for Python 2 and 3.5 'idna==2.10', # Must stay in sync with "requests" 'chardet==3.0.4', # Must stay in sync with "requests" - 'urllib3==1.25.11', # Must stay in sync with "requests" - 'requests==2.24.0', + 'urllib3==1.26.1', # Must stay in sync with "requests" + 'requests==2.25.0', 'selenium==3.141.0', 'msedge-selenium-tools==3.141.2', 'more-itertools==5.0.0;python_version<"3.5"', 'more-itertools==8.6.0;python_version>="3.5"', 'cssselect==1.1.0', 'pluggy==0.13.1', - 'attrs>=20.2.0', 'py==1.8.1;python_version<"3.5"', 'py==1.9.0;python_version>="3.5"', 'pytest==4.6.11;python_version<"3.5"', @@ -166,7 +167,8 @@ 'pyotp==2.4.1', 'boto==2.49.0', 'cffi==1.14.3', - 'rich==9.1.0;python_version>="3.6" and python_version<"4.0"', + 'toml==0.10.2', + 'rich==9.2.0;python_version>="3.6" and python_version<"4.0"', 'zipp==1.2.0;python_version<"3.6"', 'zipp==3.4.0;python_version>="3.6"', 'flake8==3.7.9;python_version<"3.5"', @@ -175,7 +177,6 @@ 'pyflakes==2.2.0;python_version>="3.5"', 'tornado==5.1.1;python_version<"3.5"', 'tornado==6.1;python_version>="3.5"', - 'certifi>=2020.6.20', 'allure-pytest==2.8.19', 'pdfminer.six==20191110;python_version<"3.5"', 'pdfminer.six==20201018;python_version>="3.5"', From db4fc4baff9858a0711fdbba5dd0ab1d3fd4ba2e Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Thu, 12 Nov 2020 00:56:42 -0500 Subject: [PATCH 2/4] Update mkdocs requirements --- docs/requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 74db3f1aa91..3b6fff93977 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,11 +1,11 @@ -regex>=2020.10.28 +regex>=2020.11.11 tqdm>=4.51.0 livereload==2.6.3;python_version>="3.6" Markdown==3.3.3 readme-renderer==28.0 pymdown-extensions==8.0.1 mkdocs==1.1.2 -mkdocs-material==6.1.0 +mkdocs-material==6.1.4 mkdocs-simple-hooks==0.1.2 mkdocs-material-extensions==1.0.1 mkdocs-minify-plugin==0.3.0 From 293bf8879c8bb33bee0db23bb36904bfed06a4b9 Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Thu, 12 Nov 2020 00:57:20 -0500 Subject: [PATCH 3/4] Update the docs --- README.md | 8 ++++---- examples/ReadMe.md | 10 +++++----- examples/example_logs/ReadMe.md | 2 +- examples/swag_labs_suite.py | 2 +- examples/test_swag_labs.py | 2 +- help_docs/customizing_test_runs.md | 2 +- help_docs/mobile_testing.md | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 152a1172f7b..b400ec645cd 100755 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ Tests are run with pytest -------- -

SeleniumBase Mobile Mode

+

SeleniumBase Mobile Mode

```bash pytest test_swag_labs.py --mobile @@ -65,7 +65,7 @@ pytest test_swag_labs.py --mobile

(Above: test_swag_labs.py in Mobile Mode.)

(Below: Same test running in Demo Mode.)

-

SeleniumBase Demo Mode

+

SeleniumBase Demo Mode

```bash pytest test_swag_labs.py --demo @@ -211,7 +211,7 @@ pytest test_swag_labs.py pytest my_first_test.py --demo ``` - + Here's the code for [my_first_test.py](https://github.com/seleniumbase/SeleniumBase/blob/master/examples/my_first_test.py): @@ -514,7 +514,7 @@ The ``--report`` option gives you a fancy report after your test suite completes nosetests test_suite.py --report ``` -Example Nosetest Report +Example Nosetest Report (NOTE: You can add ``--show-report`` to immediately display Nosetest reports after the test suite completes. Only use ``--show-report`` when running tests locally because it pauses the test run.) diff --git a/examples/ReadMe.md b/examples/ReadMe.md index 7e9adb4696b..3a701d2941e 100755 --- a/examples/ReadMe.md +++ b/examples/ReadMe.md @@ -32,7 +32,7 @@ Run an example test in Demo Mode: (highlight assertions) pytest my_first_test.py --demo ``` -
+
Run a different example in Demo Mode: @@ -40,7 +40,7 @@ Run a different example in Demo Mode: pytest test_swag_labs.py --demo ``` -
+
Run an example test in Headless Mode: (invisible browser) @@ -54,7 +54,7 @@ Run an example test using Chrome's mobile device emulator: (default settings) pytest test_swag_labs.py --mobile ``` -
+
Run tests with verbose output: (includes more details) @@ -68,7 +68,7 @@ Run a test on the Demo Site to try many SeleniumBase methods: pytest test_demo_site.py ``` -
+
Run tests multi-threaded using [n] threads: @@ -156,7 +156,7 @@ To make things easier, here's a simple GUI program that allows you to run a few python gui_test_runner.py ``` - + -------- diff --git a/examples/example_logs/ReadMe.md b/examples/example_logs/ReadMe.md index de6cbf134e5..893d0f6d0ba 100755 --- a/examples/example_logs/ReadMe.md +++ b/examples/example_logs/ReadMe.md @@ -39,7 +39,7 @@ The ``--report`` option gives you a fancy report after your test suite completes ```bash nosetests test_suite.py --report --browser=chrome ``` -Example Nosetest Report +Example Nosetest Report (NOTE: You can add ``--show-report`` to immediately display Nosetest reports after the test suite completes. Only use ``--show-report`` when running tests locally because it pauses the test run.) diff --git a/examples/swag_labs_suite.py b/examples/swag_labs_suite.py index bef4db44d8e..14b09771f58 100755 --- a/examples/swag_labs_suite.py +++ b/examples/swag_labs_suite.py @@ -6,7 +6,7 @@ class SwagLabsTests(BaseCase): def login_to_swag_labs(self, username="standard_user"): - """ Login to Swag Labs and verify that login was successful. """ + """ Login to Swag Labs and verify success. """ self.open("https://www.saucedemo.com/") if username not in self.get_text("#login_credentials"): self.fail("Invalid user for login: %s" % username) diff --git a/examples/test_swag_labs.py b/examples/test_swag_labs.py index 5574dfd38f9..1db9811a81c 100755 --- a/examples/test_swag_labs.py +++ b/examples/test_swag_labs.py @@ -4,7 +4,7 @@ class SwagLabsTests(BaseCase): def login_to_swag_labs(self, username="standard_user"): - """ Login to Swag Labs and verify that login was successful. """ + """ Login to Swag Labs and verify success. """ self.open("https://www.saucedemo.com/") if username not in self.get_text("#login_credentials"): self.fail("Invalid user for login: %s" % username) diff --git a/help_docs/customizing_test_runs.md b/help_docs/customizing_test_runs.md index bf9780ad4c4..fd2677629d3 100755 --- a/help_docs/customizing_test_runs.md +++ b/help_docs/customizing_test_runs.md @@ -276,7 +276,7 @@ The ``--report`` option gives you a fancy report after your test suite completes nosetests test_suite.py --report ``` -Example Nosetest Report +Example Nosetest Report (NOTE: You can add ``--show_report`` to immediately display Nosetest reports after the test suite completes. Only use ``--show_report`` when running tests locally because it pauses the test run.) diff --git a/help_docs/mobile_testing.md b/help_docs/mobile_testing.md index 0cd6adb6e26..fc9a5cf0c75 100755 --- a/help_docs/mobile_testing.md +++ b/help_docs/mobile_testing.md @@ -44,7 +44,7 @@ To find real User-Agent strings, see: pytest test_swag_labs.py --mobile ``` -[](https://seleniumbase.io/cdn/gif/swag_mobile.gif) +[](https://seleniumbase.io/cdn/gif/swag_mobile.gif) Here's an example of configuring mobile settings for that test: From 4e08d2d8db1a777194aa8ca3de985e03ca977c7c Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Thu, 12 Nov 2020 00:57:47 -0500 Subject: [PATCH 4/4] Version 1.50.5 --- seleniumbase/__version__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seleniumbase/__version__.py b/seleniumbase/__version__.py index 95a9b3b76ee..2bf986c208e 100755 --- a/seleniumbase/__version__.py +++ b/seleniumbase/__version__.py @@ -1,2 +1,2 @@ # seleniumbase package -__version__ = "1.50.4" +__version__ = "1.50.5"