From 4665e0848b8884bfde8b09c6df7159d264e44bb7 Mon Sep 17 00:00:00 2001 From: Dmitrij <142047569+Deimmm@users.noreply.github.com> Date: Sun, 13 Aug 2023 18:14:03 +0300 Subject: [PATCH 1/6] fix HEADPOST methods in fetch /driver_utils.py --- src/selenium_profiles/scripts/driver_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/selenium_profiles/scripts/driver_utils.py b/src/selenium_profiles/scripts/driver_utils.py index a4da7de..d2a8d75 100644 --- a/src/selenium_profiles/scripts/driver_utils.py +++ b/src/selenium_profiles/scripts/driver_utils.py @@ -1,7 +1,7 @@ class requests: def __init__(self, driver): self.driver = driver - self.methods = ["GET","HEAD" "POST", "PUT", "DELETE","OPTIONS"] # TRACE, CONNECT exluded here + self.methods = ["GET","HEAD", "POST", "PUT", "DELETE","OPTIONS"] # TRACE, CONNECT exluded here self.supported_credentials = ["omit", "same-origin", "include"] self.modes = ["cors", "no-cors", "same-origin"] self.cache_values = ["default", "no-store", "reload", "no-cache", "force-cache", "only-if-cached"] From 71def95ad829608af0f48d243b0e38c5203470cd Mon Sep 17 00:00:00 2001 From: kaliiiiiiiiiii <89038706+kaliiiiiiiiii@users.noreply.github.com> Date: Sun, 13 Aug 2023 18:27:50 +0200 Subject: [PATCH 2/6] Update bug_report.md --- .github/ISSUE_TEMPLATE/bug_report.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 6bac502..ca42d8f 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -24,9 +24,10 @@ A clear and concise description of what you expected to happen. **Environment (please complete the following information):** - OS: [e.g. Windows, Google-Colab ] - OS-Version [e.g. 10] -- Browser [e.g. Google-Chrome, Chromium] +- Browser [e.g. `115.0.5790.166 (Official Build) (64-Bit) `] - Selenium-Profiles Version [e.g. 2.2.5.1] - Selenium Version [e.g. 4.11.1] + - Python versin [e.g. 3.7.9] **Additional context** Add any other context about the problem here. From 5d0cf6373dec5f3e6161d11c9ecd8d6f45df60e2 Mon Sep 17 00:00:00 2001 From: kaliiiiiiiiiii <89038706+kaliiiiiiiiii@users.noreply.github.com> Date: Sun, 13 Aug 2023 18:28:50 +0200 Subject: [PATCH 3/6] Update bug_report.md --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index ca42d8f..39cbee9 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -24,7 +24,7 @@ A clear and concise description of what you expected to happen. **Environment (please complete the following information):** - OS: [e.g. Windows, Google-Colab ] - OS-Version [e.g. 10] -- Browser [e.g. `115.0.5790.166 (Official Build) (64-Bit) `] +- Browser [e.g. `Google-Chrome, 115.0.5790.166 (Official Build) (64-Bit) `] - Selenium-Profiles Version [e.g. 2.2.5.1] - Selenium Version [e.g. 4.11.1] - Python versin [e.g. 3.7.9] From d85f808abee13f90141ae4b059d489ecdedc04a6 Mon Sep 17 00:00:00 2001 From: kaliiiiiiiiii Date: Sun, 13 Aug 2023 20:07:59 +0200 Subject: [PATCH 4/6] fix https://github.com/kaliiiiiiiiii/Selenium-Profiles/issues/86 --- src/selenium_profiles/webdriver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/selenium_profiles/webdriver.py b/src/selenium_profiles/webdriver.py index 0ba1010..91a5a86 100644 --- a/src/selenium_profiles/webdriver.py +++ b/src/selenium_profiles/webdriver.py @@ -108,7 +108,7 @@ def __init__(self, profile: dict = None, chrome_binary: str = None, executable_p safe_duplicates=safe_duplicates) # chrome executable path - if not chrome_binary: + if chrome_binary: options_manager.Options.binary_location = chrome_binary if (uc_webdriver.Chrome in base_drivers) or (wire_uc_webdriver.Chrome in base_drivers): From 6f700541ade15fe1539aa6fe08946364e9deb769 Mon Sep 17 00:00:00 2001 From: kaliiiiiiiiii Date: Sun, 13 Aug 2023 21:03:08 +0200 Subject: [PATCH 5/6] version == 2.2.9 --- src/selenium_profiles/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/selenium_profiles/__init__.py b/src/selenium_profiles/__init__.py index 23bc6ef..73b4b05 100644 --- a/src/selenium_profiles/__init__.py +++ b/src/selenium_profiles/__init__.py @@ -1 +1 @@ -__version__ = "2.2.8" +__version__ = "2.2.9" From 8115e2e95fe99bb97d8d16e1cb9115f36e9b2775 Mon Sep 17 00:00:00 2001 From: kaliiiiiiiiii Date: Sun, 13 Aug 2023 21:07:43 +0200 Subject: [PATCH 6/6] updated requirements.txt and setup.py --- README.md | 1 - requirements.txt | 24 +++++++++++++++--------- setup.py | 7 +------ 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 50b572f..b94f858 100644 --- a/README.md +++ b/README.md @@ -121,7 +121,6 @@ profile = \ ### selenium-driverless warning: - this package is experimental and might include bugs, please report them at [bug-reports](https://github.com/kaliiiiiiiiii/Selenium-Driverless/issues) -- only for python >=3.8 ```python from selenium_profiles.webdriver import Chrome from selenium_profiles.profiles import profiles diff --git a/requirements.txt b/requirements.txt index c695c2d..799aa40 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,15 @@ -selenium_profiles>=2.2.5.5 -requests==2.31.0 -selenium==4.8.3 # 4.1.0 for touch_actions -setuptools==67.6.0 -undetected-chromedriver==3.4.6 -trio -pillow -selenium-interceptor>=1.0.2 -selenium-wire \ No newline at end of file +selenium +requests +selenium-interceptor +undetected-chromedriver +selenium-wire +webdriver-manager +selenium-injector>=2.3 + +# google-colab +# PyVirtualDisplay +# google-colab-shell + +# dev +setuptools +twine \ No newline at end of file diff --git a/setup.py b/setup.py index a276e04..58e89d2 100644 --- a/setup.py +++ b/setup.py @@ -4,12 +4,7 @@ requirements = ['selenium', 'requests', 'selenium-interceptor', "undetected-chromedriver", "selenium-wire", "webdriver-manager", - "selenium-injector>=2.3"] - -py_version = sys.version_info -if py_version.major >= 3 and py_version.minor >= 8: - # requires python >= 3.8 - requirements.append("selenium-driverless>=1.2.2") + "selenium-injector>=2.3","selenium-driverless>=1.2.2"] if 'google.colab' in sys.modules: # we're on google-colab requirements.extend(['PyVirtualDisplay', "google-colab-shell"])