From d60aa378dd3cfe49e853ed2f8bf0d1bf60694ed7 Mon Sep 17 00:00:00 2001 From: sandeepsuryaprasad Date: Wed, 28 Aug 2024 19:15:08 +0530 Subject: [PATCH 1/3] resolved conflicts --- py/pyproject.toml | 47 ++++++++++++++++++++++++++++++++++++++ py/setup.py | 58 ----------------------------------------------- 2 files changed, 47 insertions(+), 58 deletions(-) diff --git a/py/pyproject.toml b/py/pyproject.toml index c17be72be8eb3..5a70e39fc9650 100644 --- a/py/pyproject.toml +++ b/py/pyproject.toml @@ -2,6 +2,53 @@ requires = ["setuptools", "setuptools-rust"] build-backend = "setuptools.build_meta" +[project] +name = "selenium" +version = "4.24.0.dev202407241614" +license = "Apache 2.0" +description = "Official Python bindings for Selenium WebDriver." +readme = "README.rst" +requires-python = "~=3.8" +classifiers = [ + "Development Status :: 5 - Production/Stable", + "Intended Audience :: Developers", + "License :: OSI Approved :: Apache Software License", + "Operating System :: POSIX", + "Operating System :: Microsoft :: Windows", + "Operating System :: MacOS :: MacOS X", + "Topic :: Software Development :: Testing", + "Topic :: Software Development :: Libraries", + "Programming Language :: Python", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", + ] +dependencies = [ + "urllib3[socks]>=1.26,<3", + "trio~=0.17", + "trio-websocket~=0.9", + "certifi>=2021.10.8", + "typing_extensions~=4.9", + "websocket-client~=1.8", + ] + +[tool.setuptools] +zip-safe = false + +[tool.setuptools.packages.find] +include = ["selenium*"] +exclude = ["test*"] +namespace = false + +[project.urls] +Repository = "https://github.com/SeleniumHQ/selenium/" +BugTracker = "https://github.com/SeleniumHQ/selenium/issues" +Changelog = "https://github.com/SeleniumHQ/selenium/blob/trunk/py/CHANGES" +Documentation = "https://www.selenium.dev/documentation/overview/" +SourceCode = "https://github.com/SeleniumHQ/selenium/tree/trunk/py" + [tool.pytest.ini_options] console_output_style = "progress" faulthandler_timeout = 60 diff --git a/py/setup.py b/py/setup.py index b8e6a9866f271..0f93e33f0ecae 100755 --- a/py/setup.py +++ b/py/setup.py @@ -27,70 +27,12 @@ setup_args = { 'cmdclass': {'install': install}, - 'name': 'selenium', - 'version': "4.24.0.dev202407312116", - 'license': 'Apache 2.0', - 'description': 'Official Python bindings for Selenium WebDriver.', - 'long_description': open(join(abspath(dirname(__file__)), "README.rst")).read(), - 'url': 'https://github.com/SeleniumHQ/selenium/', - 'project_urls': { - 'Bug Tracker': 'https://github.com/SeleniumHQ/selenium/issues', - 'Changes': 'https://github.com/SeleniumHQ/selenium/blob/trunk/py/CHANGES', - 'Documentation': 'https://www.selenium.dev/documentation/overview/', - 'Source Code': 'https://github.com/SeleniumHQ/selenium/tree/trunk/py', - }, - 'python_requires': '~=3.8', - 'classifiers': ['Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'License :: OSI Approved :: Apache Software License', - 'Operating System :: POSIX', - 'Operating System :: Microsoft :: Windows', - 'Operating System :: MacOS :: MacOS X', - 'Topic :: Software Development :: Testing', - 'Topic :: Software Development :: Libraries', - 'Programming Language :: Python', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', - 'Programming Language :: Python :: 3.10', - 'Programming Language :: Python :: 3.11', - 'Programming Language :: Python :: 3.12', - ], - 'package_dir': { - 'selenium': 'selenium', - 'selenium.common': 'selenium/common', - 'selenium.webdriver': 'selenium/webdriver', - }, - 'packages': ['selenium', - 'selenium.common', - 'selenium.webdriver', - 'selenium.webdriver.chrome', - 'selenium.webdriver.chromium', - 'selenium.webdriver.common', - 'selenium.webdriver.edge', - 'selenium.webdriver.firefox', - 'selenium.webdriver.ie', - 'selenium.webdriver.remote', - 'selenium.webdriver.safari', - 'selenium.webdriver.support', - 'selenium.webdriver.webkitgtk', - 'selenium.webdriver.wpewebkit', - ], - 'include_package_data': True, - 'install_requires': [ - "urllib3[socks]>=1.26,<3", - "trio~=0.17", - "trio-websocket~=0.9", - "certifi>=2021.10.8", - "typing_extensions~=4.9", - "websocket-client~=1.8", - ], 'rust_extensions': [ RustExtension( {"selenium-manager": "selenium.webdriver.common.selenium-manager"}, binding=Binding.Exec ) ], - 'zip_safe': False } setup(**setup_args) From fe5d40f88ab236f3dc938323a7460cfd0998a68a Mon Sep 17 00:00:00 2001 From: Sandeep Suryaprasad <26169602+sandeepsuryaprasad@users.noreply.github.com> Date: Sun, 3 Nov 2024 12:56:38 +0530 Subject: [PATCH 2/3] updated selenium version to 4.27.0.dev202410311942 --- py/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/py/pyproject.toml b/py/pyproject.toml index ef754772aa38a..4b334bb133341 100644 --- a/py/pyproject.toml +++ b/py/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "selenium" -version = "4.24.0.dev202407241614" +version = "4.27.0.dev202410311942" license = "Apache 2.0" description = "Official Python bindings for Selenium WebDriver." readme = "README.rst" From db53ae5e2e7a239b305631b765d332f958cb5ac9 Mon Sep 17 00:00:00 2001 From: sandeepsuryaprasad Date: Mon, 18 Nov 2024 18:50:02 +0530 Subject: [PATCH 3/3] fixed bug in pyproject.toml by removing duplicate entry of table [tool.setuptools.packages.find] --- py/pyproject.toml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/py/pyproject.toml b/py/pyproject.toml index 504d3f88d569a..7ee15417a32f1 100644 --- a/py/pyproject.toml +++ b/py/pyproject.toml @@ -41,6 +41,7 @@ zip-safe = false include = ["selenium*"] exclude = ["test*"] namespace = false +# include-package-data is `true` by default in pyproject.toml [project.urls] Repository = "https://github.com/SeleniumHQ/selenium/" @@ -49,12 +50,6 @@ Changelog = "https://github.com/SeleniumHQ/selenium/blob/trunk/py/CHANGES" Documentation = "https://www.selenium.dev/documentation/overview/" SourceCode = "https://github.com/SeleniumHQ/selenium/tree/trunk/py" -[tool.setuptools.packages.find] -include = ["selenium*"] -exclude = ["test*"] -namespaces = false -# include-package-data is `true` by default in pyproject.toml - [tool.setuptools.package-data] selenium_package = [ "*.py", @@ -145,4 +140,4 @@ line-length = 120 target-version = ['py38'] [tool.docformatter] -recursive = true \ No newline at end of file +recursive = true