From 4331fe584a6b0e6222fc6e2eb296dadef8356df5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Tue, 21 Jan 2025 16:38:38 +0100 Subject: [PATCH 1/2] [py] Fix installing most of the data from source distributions Change `namespaces` to true to fix installing `selenium.webdriver.common.devtools.*` packages, and fix `package-data` to fix installing `.js` and `.json` data files. The latter would specify a non-existing `selenium_package` package name -- instead, specify `*` to apply it to all Python packages found. With these changes, the result of installing the source distribution is almost identical to the result of installing the wheel. One remaining problem is that `selenium-manager` is not included -- my guess is that there is no logic copying the built Rust executable into the expected location. Another problem is that these changes do not work when installing from a VCS checkout -- since all the relevant data files are explicitly excluded by `.gitignore` and that takes precedence over `data-files`. However, this was broken before, so it should not really matter. Fixes #15125 --- py/pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/py/pyproject.toml b/py/pyproject.toml index 9afa6a63c7f8a..3883e80837608 100644 --- a/py/pyproject.toml +++ b/py/pyproject.toml @@ -40,7 +40,7 @@ zip-safe = false [tool.setuptools.packages.find] include = ["selenium*"] exclude = ["test*"] -namespaces = false +namespaces = true # include-package-data is `true` by default in pyproject.toml [[tool.setuptools-rust.bins]] @@ -54,7 +54,7 @@ Documentation = "https://www.selenium.dev/documentation/overview/" SourceCode = "https://github.com/SeleniumHQ/selenium/tree/trunk/py" [tool.setuptools.package-data] -selenium_package = [ +"*" = [ "*.py", "*.rst", "*.json", From 8796480b70fcf7b1cd347a4973683d1aa21bd6a0 Mon Sep 17 00:00:00 2001 From: Viet Nguyen Duc Date: Wed, 22 Jan 2025 11:50:37 +0700 Subject: [PATCH 2/2] Get ready for patch 4.28.1 Signed-off-by: Viet Nguyen Duc --- py/BUILD.bazel | 2 +- py/CHANGES | 3 +++ py/docs/source/conf.py | 4 ++-- py/pyproject.toml | 2 +- py/selenium/__init__.py | 2 +- py/selenium/webdriver/__init__.py | 2 +- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/py/BUILD.bazel b/py/BUILD.bazel index b4999b6607fe0..34b8eb8699012 100644 --- a/py/BUILD.bazel +++ b/py/BUILD.bazel @@ -62,7 +62,7 @@ compile_pip_requirements( ], ) -SE_VERSION = "4.29.0.202501201850" +SE_VERSION = "4.28.1" BROWSER_VERSIONS = [ "v85", diff --git a/py/CHANGES b/py/CHANGES index 7426a5b1f8749..3219a596db008 100644 --- a/py/CHANGES +++ b/py/CHANGES @@ -1,3 +1,6 @@ +Selenium 4.28.1 +* [py] Fix installing most of the data from source distributions + Selenium 4.28.0 * Add CDP for Chrome 132 and remove 129 * [py] fix packaging (#14823) diff --git a/py/docs/source/conf.py b/py/docs/source/conf.py index fd7f04c315180..21491eec081d8 100644 --- a/py/docs/source/conf.py +++ b/py/docs/source/conf.py @@ -56,9 +56,9 @@ # built documents. # # The short X.Y version. -version = '4.29' +version = '4.28' # The full version, including alpha/beta/rc tags. -release = '4.29.0.202501201850' +release = '4.28.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/py/pyproject.toml b/py/pyproject.toml index 3883e80837608..e6214bf16dd75 100644 --- a/py/pyproject.toml +++ b/py/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "selenium" -version = "4.29.0.202501201850" +version = "4.28.1" license = { text = "Apache 2.0" } description = "Official Python bindings for Selenium WebDriver." readme = "README.rst" diff --git a/py/selenium/__init__.py b/py/selenium/__init__.py index bbdf061facf86..fedd241d71f5e 100644 --- a/py/selenium/__init__.py +++ b/py/selenium/__init__.py @@ -16,4 +16,4 @@ # under the License. -__version__ = "4.29.0.202501201850" +__version__ = "4.28.1" diff --git a/py/selenium/webdriver/__init__.py b/py/selenium/webdriver/__init__.py index 82f7bd618bfa1..80e68e8930fb3 100644 --- a/py/selenium/webdriver/__init__.py +++ b/py/selenium/webdriver/__init__.py @@ -44,7 +44,7 @@ from .wpewebkit.service import Service as WPEWebKitService # noqa from .wpewebkit.webdriver import WebDriver as WPEWebKit # noqa -__version__ = "4.29.0.202501201850" +__version__ = "4.28.1" # We need an explicit __all__ because the above won't otherwise be exported. __all__ = [