Merge pull request #1072 from seleniumbase/improve-grid-arg-parsing

mdmintz · web-flow · commit d5e48700ba2e · 2021-11-15T15:22:20.000-05:00
Improve arg-parsing for Selenium Grid usage
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -11,15 +11,15 @@ jobs:
     vmImage: 'Ubuntu-20.04'
   strategy:
     matrix:
-      Python3.5:
+      Python3_5:
         python.version: '3.5'
-      Python3.6:
+      Python3_6:
         python.version: '3.6'
-      Python3.7:
+      Python3_7:
         python.version: '3.7'
-      Python3.8:
+      Python3_8:
         python.version: '3.8'
-      Python3.9:
+      Python3_9:
         python.version: '3.9'
     maxParallel: 5
 
diff --git a/requirements.txt b/requirements.txt
@@ -2,23 +2,19 @@ pip>=20.3.4;python_version<"3.6"
 pip>=21.3.1;python_version>="3.6"
 packaging>=20.9;python_version<"3.6"
 packaging>=21.2;python_version>="3.6"
-typing-extensions>=3.10.0.2
 setuptools>=44.1.1;python_version<"3.5"
 setuptools>=50.3.2;python_version>="3.5" and python_version<"3.6"
-setuptools>=58.5.3;python_version>="3.6"
-setuptools-scm==5.0.2;python_version<"3.6"
+setuptools>=59.1.0;python_version>="3.6"
+setuptools-scm>=5.0.2;python_version<"3.6"
 setuptools-scm>=6.3.2;python_version>="3.6"
 tomli>=1.2.2;python_version>="3.6"
 wheel>=0.37.0
 attrs>=21.2.0
 PyYAML>=6.0;python_version>="3.6"
-traitlets==4.3.3;python_version<"3.7"
+traitlets>=4.3.3;python_version<"3.7"
 traitlets>=5.1.1;python_version>="3.7"
 certifi>=2021.10.8
-sortedcontainers==2.4.0
 six==1.16.0
-nose==1.3.7
-sniffio;python_version>="3.7"
 ipdb==0.13.4;python_version<"3.5"
 ipdb==0.13.9;python_version>="3.5"
 parso==0.7.1;python_version<"3.6"
@@ -34,16 +30,19 @@ urllib3==1.26.7
 requests==2.26.0;python_version<"3.5"
 requests==2.25.1;python_version>="3.5" and python_version<"3.6"
 requests==2.26.0;python_version>="3.6"
-selenium==3.141.0;python_version<"3.7"
-selenium==4.0.0;python_version>="3.7"
-wsproto==1.0.0;python_version>="3.7"
+nose==1.3.7
+sniffio==1.2.0;python_version>="3.7"
 trio==0.19.0;python_version>="3.7"
 trio-websocket==0.9.2;python_version>="3.7"
 pyopenssl==21.0.0;python_version>="3.7"
+wsproto==1.0.0;python_version>="3.7"
+selenium==3.141.0;python_version<"3.7"
+selenium==4.0.0;python_version>="3.7"
 msedge-selenium-tools==3.141.3;python_version<"3.7"
 more-itertools==5.0.0;python_version<"3.5"
 more-itertools==8.11.0;python_version>="3.5"
 cssselect==1.1.0
+sortedcontainers==2.4.0
 filelock==3.2.1;python_version<"3.6"
 filelock==3.3.2;python_version>="3.6"
 fasteners==0.16;python_version<"3.5"
@@ -72,7 +71,7 @@ parameterized==0.8.1
 sbvirtualdisplay==1.0.0
 soupsieve==1.9.6;python_version<"3.5"
 soupsieve==2.1;python_version>="3.5" and python_version<"3.6"
-soupsieve==2.3;python_version>="3.6"
+soupsieve==2.3.1;python_version>="3.6"
 beautifulsoup4==4.9.3;python_version<"3.5"
 beautifulsoup4==4.10.0;python_version>="3.5"
 cryptography==2.9.2;python_version<"3.5"
@@ -108,6 +107,7 @@ toml==0.10.2
 Pillow==6.2.2;python_version<"3.5"
 Pillow==7.2.0;python_version>="3.5" and python_version<"3.6"
 Pillow==8.4.0;python_version>="3.6"
+typing-extensions==3.10.0.2;python_version<"3.8"
 rich==10.13.0;python_version>="3.6" and python_version<"4.0"
 tornado==5.1.1;python_version<"3.5"
 tornado==6.1;python_version>="3.5"
@@ -119,7 +119,7 @@ pdfminer.six==20211012;python_version>="3.6"
 # ("pip install -r requirements.txt" also installs this, but "pip install -e ." won't.)
 
 coverage==5.5;python_version<"3.6"
-coverage==6.1.1;python_version>="3.6"
+coverage==6.1.2;python_version>="3.6"
 pytest-cov==2.12.1;python_version<"3.6"
 pytest-cov==3.0.0;python_version>="3.6"
 flake8==3.7.9;python_version<"3.5"
diff --git a/seleniumbase/__version__.py b/seleniumbase/__version__.py
@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "2.1.6"
+__version__ = "2.1.7"
diff --git a/seleniumbase/core/browser_launcher.py b/seleniumbase/core/browser_launcher.py
@@ -876,8 +876,31 @@ def get_remote_driver(
     device_height,
     device_pixel_ratio,
 ):
+    # Construct the address for connecting to a Selenium Grid
+    if servername.startswith("https://"):
+        protocol = "https"
+        servername = servername.split("https://")[1]
+    elif "://" in servername:
+        servername = servername.split("://")[1]
+    server_with_port = ""
+    if ":" not in servername:
+        col_port = ":" + str(port)
+        first_slash = servername.find("/")
+        if first_slash != -1:
+            server_with_port = (
+                servername[:first_slash] + col_port + servername[first_slash:]
+            )
+        else:
+            server_with_port = servername + col_port
+    else:
+        server_with_port = servername
+    address = "%s://%s" % (protocol, server_with_port)
+    if not address.endswith("/wd/hub"):
+        if address.endswith("/"):
+            address += "wd/hub"
+        else:
+            address += "/wd/hub"
     downloads_path = download_helper.get_downloads_folder()
-    address = "%s://%s:%s/wd/hub" % (protocol, servername, port)
     desired_caps = {}
     extra_caps = {}
     if cap_file:
diff --git a/setup.py b/setup.py
@@ -118,23 +118,19 @@
         'pip>=21.3.1;python_version>="3.6"',
         'packaging>=20.9;python_version<"3.6"',
         'packaging>=21.2;python_version>="3.6"',
-        "typing-extensions>=3.10.0.2",
         'setuptools>=44.1.1;python_version<"3.5"',
         'setuptools>=50.3.2;python_version>="3.5" and python_version<"3.6"',
-        'setuptools>=58.5.3;python_version>="3.6"',
-        'setuptools-scm==5.0.2;python_version<"3.6"',
+        'setuptools>=59.1.0;python_version>="3.6"',
+        'setuptools-scm>=5.0.2;python_version<"3.6"',
         'setuptools-scm>=6.3.2;python_version>="3.6"',
         'tomli>=1.2.2;python_version>="3.6"',
         "wheel>=0.37.0",
         "attrs>=21.2.0",
         'PyYAML>=6.0;python_version>="3.6"',
-        'traitlets==4.3.3;python_version<"3.7"',
+        'traitlets>=4.3.3;python_version<"3.7"',
         'traitlets>=5.1.1;python_version>="3.7"',
         "certifi>=2021.10.8",
-        "sortedcontainers==2.4.0",
         "six==1.16.0",
-        "nose==1.3.7",
-        'sniffio;python_version>="3.7"',  # For "trio". (Funnier under "nose")
         'ipdb==0.13.4;python_version<"3.5"',
         'ipdb==0.13.9;python_version>="3.5"',
         'parso==0.7.1;python_version<"3.6"',
@@ -150,16 +146,19 @@
         'requests==2.26.0;python_version<"3.5"',
         'requests==2.25.1;python_version>="3.5" and python_version<"3.6"',
         'requests==2.26.0;python_version>="3.6"',
-        'selenium==3.141.0;python_version<"3.7"',
-        'selenium==4.0.0;python_version>="3.7"',
-        'wsproto==1.0.0;python_version>="3.7"',
+        "nose==1.3.7",
+        'sniffio==1.2.0;python_version>="3.7"',
         'trio==0.19.0;python_version>="3.7"',
         'trio-websocket==0.9.2;python_version>="3.7"',
         'pyopenssl==21.0.0;python_version>="3.7"',
+        'wsproto==1.0.0;python_version>="3.7"',
+        'selenium==3.141.0;python_version<"3.7"',
+        'selenium==4.0.0;python_version>="3.7"',
         'msedge-selenium-tools==3.141.3;python_version<"3.7"',
         'more-itertools==5.0.0;python_version<"3.5"',
         'more-itertools==8.11.0;python_version>="3.5"',
         "cssselect==1.1.0",
+        "sortedcontainers==2.4.0",
         'filelock==3.2.1;python_version<"3.6"',
         'filelock==3.3.2;python_version>="3.6"',
         'fasteners==0.16;python_version<"3.5"',
@@ -188,7 +187,7 @@
         "sbvirtualdisplay==1.0.0",
         'soupsieve==1.9.6;python_version<"3.5"',
         'soupsieve==2.1;python_version>="3.5" and python_version<"3.6"',
-        'soupsieve==2.3;python_version>="3.6"',
+        'soupsieve==2.3.1;python_version>="3.6"',
         'beautifulsoup4==4.9.3;python_version<"3.5"',
         'beautifulsoup4==4.10.0;python_version>="3.5"',
         'cryptography==2.9.2;python_version<"3.5"',
@@ -224,6 +223,7 @@
         'Pillow==6.2.2;python_version<"3.5"',
         'Pillow==7.2.0;python_version>="3.5" and python_version<"3.6"',
         'Pillow==8.4.0;python_version>="3.6"',
+        'typing-extensions==3.10.0.2;python_version<"3.8"',  # Sync with "rich"
         'rich==10.13.0;python_version>="3.6" and python_version<"4.0"',
         'tornado==5.1.1;python_version<"3.5"',
         'tornado==6.1;python_version>="3.5"',
@@ -235,7 +235,7 @@
         # pip install -e .[coverage]
         "coverage": [
             'coverage==5.5;python_version<"3.6"',
-            'coverage==6.1.1;python_version>="3.6"',
+            'coverage==6.1.2;python_version>="3.6"',
             'pytest-cov==2.12.1;python_version<"3.6"',
             'pytest-cov==3.0.0;python_version>="3.6"',
         ],

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`# seleniumbase package`
`2`		`-__version__ = "2.1.6"`
	`2`	`+__version__ = "2.1.7"`