Skip to content

Commit 3e35b4b

Browse files
authored
Merge pull request #914 from seleniumbase/update-dependencies-and-masterqa-output
Update dependencies and MasterQA output
2 parents 822bb4e + b6e3766 commit 3e35b4b

File tree

6 files changed

+60
-14
lines changed

6 files changed

+60
-14
lines changed

docs/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
regex>=2021.4.4
2-
tqdm>=4.60.0
2+
tqdm>=4.61.0
33
livereload==2.6.3;python_version>="3.6"
44
joblib==1.0.1;python_version>="3.6"
55
Markdown==3.3.4;python_version>="3.6"

examples/master_qa/pytest.ini

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
[pytest]
2+
3+
# Display console output, disable cacheprovider, and have the ipdb debugger replace pdb:
4+
addopts = --capture=no -p no:cacheprovider --pdbcls=IPython.terminal.debugger:TerminalPdb
5+
6+
# Ignore warnings such as DeprecationWarning and 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

requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
pip>=20.3.4;python_version<"3.6"
2-
pip>=21.1.1;python_version>="3.6"
2+
pip>=21.1.2;python_version>="3.6"
33
packaging>=20.9
44
typing-extensions>=3.10.0.0
55
setuptools>=44.1.1;python_version<"3.5"
66
setuptools>=50.3.2;python_version>="3.5" and python_version<"3.6"
7-
setuptools>=56.2.0;python_version>="3.6"
7+
setuptools>=57.0.0;python_version>="3.6"
88
setuptools-scm==5.0.2;python_version<"3.6"
99
setuptools-scm>=6.0.1;python_version>="3.6"
1010
wheel>=0.36.2
@@ -74,7 +74,7 @@ matplotlib-inline==0.1.2;python_version>="3.7"
7474
colorama==0.4.4
7575
pathlib2==2.3.5;python_version<"3.5"
7676
importlib-metadata==2.0.0;python_version<"3.6"
77-
virtualenv>=20.4.6
77+
virtualenv>=20.4.7
7878
pymysql==0.10.1;python_version<"3.6"
7979
pymysql==1.0.2;python_version>="3.6"
8080
pyotp==2.6.0

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.63.8"
2+
__version__ = "1.63.9"

seleniumbase/masterqa/master_qa.py

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,10 @@ def auto_close_results(self):
5959

6060
def tearDown(self):
6161
if self.headless and self.check_count > 0:
62-
print("WARNING: %s manual checks were skipped!" % self.check_count)
62+
print(
63+
"WARNING: %s manual checks were skipped! (MasterQA)"
64+
% self.check_count
65+
)
6366
if sys.exc_info()[1]:
6467
self.__add_failure(sys.exc_info()[1])
6568
self.__process_manual_check_results(self.auto_close_results_page)
@@ -362,7 +365,9 @@ def __add_results_page(self, html):
362365
def __process_manual_check_results(self, auto_close_results_page=False):
363366
perfection = True
364367
failures_count = self.manual_check_count - self.manual_check_successes
365-
print("\n\n*** Test Result: ***")
368+
if not self.headless:
369+
print("")
370+
print("\n*** MasterQA Manual Test Results: ***")
366371
if self.manual_check_successes == self.manual_check_count:
367372
pass
368373
else:
@@ -469,9 +474,10 @@ def __process_manual_check_results(self, auto_close_results_page=False):
469474
results_file = self.__add_results_page(report_html)
470475
archived_results_file = log_path + "/" + self.RESULTS_PAGE
471476
shutil.copyfile(results_file, archived_results_file)
472-
print(
473-
"\n*** The results html page is located at: ***\n" + results_file
474-
)
477+
if self.manual_check_count > 0:
478+
print(
479+
"\n*** The manual test report is located at:\n" + results_file
480+
)
475481
self.open("file://%s" % archived_results_file)
476482
if auto_close_results_page:
477483
# Long enough to notice the results before closing the page

setup.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
print("\n*** Installing twine: *** (Required for PyPI uploads)\n")
5151
os.system("python -m pip install --upgrade 'twine>=1.15.0'")
5252
print("\n*** Installing tqdm: *** (Required for PyPI uploads)\n")
53-
os.system("python -m pip install --upgrade 'tqdm>=4.60.0'")
53+
os.system("python -m pip install --upgrade 'tqdm>=4.61.0'")
5454
print("\n*** Publishing The Release to PyPI: ***\n")
5555
os.system("python -m twine upload dist/*") # Requires ~/.pypirc Keys
5656
print("\n*** The Release was PUBLISHED SUCCESSFULLY to PyPI! :) ***\n")
@@ -114,12 +114,12 @@
114114
python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*",
115115
install_requires=[
116116
'pip>=20.3.4;python_version<"3.6"',
117-
'pip>=21.1.1;python_version>="3.6"',
117+
'pip>=21.1.2;python_version>="3.6"',
118118
"packaging>=20.9",
119119
"typing-extensions>=3.10.0.0",
120120
'setuptools>=44.1.1;python_version<"3.5"',
121121
'setuptools>=50.3.2;python_version>="3.5" and python_version<"3.6"',
122-
'setuptools>=56.2.0;python_version>="3.6"',
122+
'setuptools>=57.0.0;python_version>="3.6"',
123123
'setuptools-scm==5.0.2;python_version<"3.6"',
124124
'setuptools-scm>=6.0.1;python_version>="3.6"',
125125
"wheel>=0.36.2",
@@ -189,7 +189,7 @@
189189
"colorama==0.4.4",
190190
'pathlib2==2.3.5;python_version<"3.5"', # Sync with "virtualenv"
191191
'importlib-metadata==2.0.0;python_version<"3.6"', # Sync "virtualenv"
192-
"virtualenv>=20.4.6", # Sync with importlib-metadata and pathlib2
192+
"virtualenv>=20.4.7", # Sync with importlib-metadata and pathlib2
193193
'pymysql==0.10.1;python_version<"3.6"',
194194
'pymysql==1.0.2;python_version>="3.6"',
195195
"pyotp==2.6.0",

0 commit comments

Comments
 (0)