From 705967fc4f71c69534cdb37ea1ec3f66973c2385 Mon Sep 17 00:00:00 2001 From: Dor-bl <59066376+Dor-bl@users.noreply.github.com> Date: Tue, 7 Apr 2026 05:00:58 +0000 Subject: [PATCH 1/4] chore: remove setup.py and bump major version to v6.0.0 - Completely remove setup.py. - Bump major version of the package to 6.0.0. - Update appium/version.py with a static version string for consistency. - Sync pyproject.toml and appium/version.py via semantic-release configuration. - Update CHANGELOG.md. --- CHANGELOG.md | 10 ++++++++++ appium/version.py | 9 +-------- pyproject.toml | 9 ++------- setup.py | 45 --------------------------------------------- 4 files changed, 13 insertions(+), 60 deletions(-) delete mode 100644 setup.py diff --git a/CHANGELOG.md b/CHANGELOG.md index 192c5573b..94861f7dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,16 @@ +## v6.0.0 (2026-04-06) + +### Breaking Changes + +- Remove `setup.py` completely. + +### Chores + +- Bump the major version to v6.0.0. + ## v5.3.0 (2026-03-28) ### Bug Fixes diff --git a/appium/version.py b/appium/version.py index 0616a7c5e..ab17e965b 100644 --- a/appium/version.py +++ b/appium/version.py @@ -12,11 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -from importlib import metadata - - -def _get_version(): - return metadata.version('Appium-Python-Client') - - -version = _get_version() +version = '6.0.0' diff --git a/pyproject.toml b/pyproject.toml index fd575e093..50eabe900 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [project] name = "Appium-Python-Client" description = "Python client for Appium" -version = "5.3.0" +version = "6.0.0" readme = "README.md" license = "Apache-2.0" license-files = ["LICENSE"] @@ -64,11 +64,6 @@ dev = [ requires = ["hatchling"] build-backend = "hatchling.build" -[tool.hatch.version] -source = "regex" -path = "appium/version.py" -pattern = "(?P\\d+\\.\\d+\\.\\d+)" - [tool.hatch.build] exclude = [ "test/", @@ -94,7 +89,7 @@ major_on_zero = true allow_zero_version = false no_git_verify = false tag_format = "v{version}" -version_toml = ["pyproject.toml:project.version"] +version_toml = ["pyproject.toml:project.version", "appium/version.py:version"] [tool.semantic_release.branches.main] match = "(main|master)" diff --git a/setup.py b/setup.py deleted file mode 100644 index f32eab925..000000000 --- a/setup.py +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env python - -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# FIXME: Remove this setup.py completely. -# Then, we should bump the major version since the package will not include setup.py. - -try: - # Python 3.11+ - import tomllib -except Exception: - # for older versions - import tomli as tomllib - -with open('pyproject.toml', 'rb') as f: - pyproject = tomllib.load(f) - project = pyproject['project'] - -from setuptools import find_packages, setup - -setup( - name=project['name'], - version=project['version'], - description=project['description'], - keywords=project['keywords'], - author=project['authors'][0]['name'], - author_email=project['authors'][0]['email'], - maintainer=', '.join([maintainer['name'] for maintainer in project['maintainers']]), - url=project['urls']['Homepage'], - package_data={'appium': ['py.typed']}, - packages=find_packages(include=['appium*']), - license=project['license'], - classifiers=project['classifiers'], - install_requires=project['dependencies'], -) From 84a871c90afa59fd348a5688d0819f42d8fb9f99 Mon Sep 17 00:00:00 2001 From: Dor-bl Date: Fri, 17 Apr 2026 23:05:58 +0200 Subject: [PATCH 2/4] chore: update appium-python-client version to 6.0.0 --- uv.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uv.lock b/uv.lock index b27486680..74cc641f8 100644 --- a/uv.lock +++ b/uv.lock @@ -43,7 +43,7 @@ wheels = [ [[package]] name = "appium-python-client" -version = "5.3.0" +version = "6.0.0" source = { editable = "." } dependencies = [ { name = "selenium", version = "4.36.0", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.10'" }, From b8f443bd44fcc2367a30ade9827b053ccbdcef26 Mon Sep 17 00:00:00 2001 From: Dor-bl Date: Fri, 17 Apr 2026 23:10:46 +0200 Subject: [PATCH 3/4] chore: update CHANGELOG for v6.0.0 release, removing setup.py details --- CHANGELOG.md | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 94861f7dc..192c5573b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,16 +2,6 @@ -## v6.0.0 (2026-04-06) - -### Breaking Changes - -- Remove `setup.py` completely. - -### Chores - -- Bump the major version to v6.0.0. - ## v5.3.0 (2026-03-28) ### Bug Fixes From 261dfc00eb1bbfd4d9352992c3aaf7ff57750580 Mon Sep 17 00:00:00 2001 From: Dor-bl Date: Fri, 17 Apr 2026 23:16:59 +0200 Subject: [PATCH 4/4] refactor: update version retrieval to use importlib.metadata --- appium/version.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/appium/version.py b/appium/version.py index ab17e965b..108a17d04 100644 --- a/appium/version.py +++ b/appium/version.py @@ -12,4 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -version = '6.0.0' +from importlib import metadata + + +def _get_version(): + try: + return metadata.version('Appium-Python-Client') + except metadata.PackageNotFoundError: + return 'unknown' + + +version = _get_version()