Merge pull request #157 from ezhov-evgeny/master

Master 3.14.7

Author: ezhov-evgeny

.github/workflows/release-tag.yml

@@ -21,12 +21,12 @@ jobs:
           ref: ${{ github.event.pull_request.merge_commit_sha }}
           fetch-depth: 0
 
-      - name: Get version from setup.py
+      - name: Get version from pyproject.toml
         id: version
         run: |
-          V=$(grep -E '^version\s*=\s*"' setup.py | sed -n 's/.*"\([^"]*\)".*/\1/p')
+          V=$(grep -E '^version\s*=\s*"' pyproject.toml | sed -n 's/.*"\([^"]*\)".*/\1/p')
           if [[ -z "$V" ]]; then
-            echo "Could not read version from setup.py"
+            echo "Could not read version from pyproject.toml"
             exit 1
           fi
           echo "version=$V" >> "$GITHUB_OUTPUT"

.github/workflows/release-version-bump.yml

@@ -1,4 +1,4 @@
-# When a branch named release/X.Y.Z is pushed, set version = "X.Y.Z" in setup.py and commit.
+# When a branch named release/X.Y.Z is pushed, set version = "X.Y.Z" in pyproject.toml and commit.
 # Branch name must match release/X.Y.Z (e.g. release/3.14.7). Creates one commit if version changed.
 
 name: Release version bump
@@ -31,21 +31,21 @@ jobs:
             exit 1
           fi
 
-      - name: Update version in setup.py
+      - name: Update version in pyproject.toml
         run: |
           VERSION="${{ steps.version.outputs.version }}"
-          sed -i 's/^version = ".*"/version = "'"$VERSION"'"/' setup.py
-          grep -q '^version = "'"$VERSION"'"' setup.py || (echo "Failed to update setup.py"; exit 1)
+          sed -i 's/^version = ".*"/version = "'"$VERSION"'"/' pyproject.toml
+          grep -q '^version = "'"$VERSION"'"' pyproject.toml || (echo "Failed to update pyproject.toml"; exit 1)
 
       - name: Commit and push if changed
         run: |
           git config user.name "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
-          if git diff --quiet setup.py; then
+          if git diff --quiet pyproject.toml; then
             echo "Version already set, nothing to commit"
             exit 0
           fi
-          git add setup.py
+          git add pyproject.toml
           git commit -m "chore: set version to ${{ steps.version.outputs.version }} [skip ci]"
           git push
         env:

README.md

@@ -353,6 +353,6 @@ Please use this check list before creating PR:
 
 ### Releasing
 
-Releases follow a git-flow style: create branch `release/X.Y.Z` from `develop`, update version in `setup.py`, merge into `master`, then create and push tag `vX.Y.Z`. GitHub Actions publishes to PyPI on tag push.
+Releases follow a git-flow style: create branch `release/X.Y.Z` from `develop`, update version in `pyproject.toml`, merge into `master`, then create and push tag `vX.Y.Z`. GitHub Actions publishes to PyPI on tag push.
 
 **Required:** In the repository **Settings → Secrets and variables → Actions**, add a secret `PYPI_API_TOKEN` with a PyPI API token (create at [pypi.org/manage/account/token/](https://pypi.org/manage/account/token/)). Alternatively, configure [Trusted Publishing](https://docs.pypi.org/trusted-publishers/) on PyPI and remove the `password` input from `.github/workflows/publish.yml`.

RELEASE_NOTES.md

@@ -9,7 +9,7 @@ Release Notes
 * Fixed `KeyError` when HTTP response is missing `Content-Length` header by https://github.com/xmaples
 * Fixed indentation in client response handling (#89) by https://github.com/yeus
 * Do not catch `ResponseErrorCode` so server errors propagate to callers by https://github.com/james-pcdr
-* CI/CD: migrated to GitHub Actions (#134); added `requirements.txt` and `pyproject.toml`; linter fixes; coverage reporting; use Ubuntu 22.04 for legacy Python 3.7 tests by https://github.com/ezhov-evgeny
+* CI/CD: migrated to GitHub Actions (#134) by https://github.com/ezhov-evgeny
 
 **Version 3.14.6**
 

publish.sh

@@ -1,8 +1,8 @@
 # Clean old dists
 rm -r dist
 
-# Create new packege
-python setup.py sdist
+# Create package (sdist and wheel)
+python -m build
 
 # Upload to pypi
 twine upload dist/*

pyproject.toml

@@ -4,10 +4,10 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "webdavclient3"
-version = "3.14.6"
+version = "3.14.7"
 description = "WebDAV client, based on original package https://github.com/designerror/webdav-client-python but uses requests instead of PyCURL"
 readme = "README.md"
-license = { text = "MIT License" }
+license = "MIT"
 authors = [
     { name = "Evgeny Ezhov", email = "ezhov.evgeny@gmail.com" }
 ]
@@ -18,7 +18,6 @@ keywords = [
 classifiers = [
     "Environment :: Console",
     "Environment :: Web Environment",
-    "License :: OSI Approved :: MIT License",
     "Operating System :: MacOS",
     "Operating System :: Microsoft",
     "Operating System :: Unix",
@@ -47,5 +46,8 @@ dev = ["pytest", "coverage", "ruff"]
 Homepage = "https://github.com/ezhov-evgeny/webdav-client-python-3"
 Repository = "https://github.com/ezhov-evgeny/webdav-client-python-3"
 
+[tool.setuptools]
+script-files = ["wdc"]
+
 [tool.setuptools.packages.find]
 exclude = ["tests*"]