Switch from setup.py to pyproject.toml

.github/wordlist.txt

@@ -90,6 +90,7 @@ firsttimersonly
 fo
 genindex
 gmail
+hatchling
 html
 http
 https
@@ -128,6 +129,7 @@ pubsub
 punsubscribe
 py
 pypi
+pyproject
 quickstart
 readonly
 readwrite
@@ -149,6 +151,7 @@ subcommands
 thevalueofmykey
 timeseries
 toctree
+toml
 topk
 triaging
 txt

.github/workflows/docs.yaml

@@ -38,7 +38,8 @@ jobs:
            sudo apt-get install -yqq pandoc make
        - name: run code linters
          run: |
-           pip install -r requirements.txt -r dev_requirements.txt -r docs/requirements.txt
+           pip install -r dev_requirements.txt -r docs/requirements.txt
+           pip install .
            invoke build-docs
 
        - name: upload docs

.github/workflows/install_and_test.sh

@@ -19,8 +19,8 @@ if [ -d ${DESTENV} ]; then
 fi
 python -m venv ${DESTENV}
 source ${DESTENV}/bin/activate
-pip install --upgrade --quiet pip setuptools wheel
-pip install --quiet -r dev_requirements.txt
+pip install --upgrade --quiet pip
+pip install --quiet -r dev_requrements.txt
 invoke devenv
 invoke package
 

.github/workflows/integration.yaml

@@ -32,7 +32,12 @@ jobs:
        - uses: actions/checkout@v5
        - uses: pypa/[email protected]
          with:
-           inputs: requirements.txt dev_requirements.txt
+           inputs: .
+           ignore-vulns: |
+             GHSA-w596-4wvx-j9j6  # subversion related git pull, dependency for pytest. There is no impact here.
+       - uses: pypa/[email protected]
+         with:
+           inputs: dev_requirements.txt
            ignore-vulns: |
              GHSA-w596-4wvx-j9j6  # subversion related git pull, dependency for pytest. There is no impact here.
 
@@ -115,9 +120,8 @@ jobs:
 
        - name: run tests
          run: |
-           pip install -U setuptools wheel
-           pip install -r requirements.txt
            pip install -r dev_requirements.txt
+           pip install .
            if [ "${{matrix.connection-type}}" == "libvalkey" ]; then
             pip install "libvalkey>=4.0.1"
            fi

.github/workflows/pypi-publish.yaml

@@ -23,12 +23,11 @@ jobs:
       - name: Install dev tools
         run: |
           pip install -r dev_requirements.txt
-          pip install twine wheel
+          pip install twine
 
       - name: Build package
         run: |
-          python setup.py build
-          python setup.py sdist bdist_wheel
+          hatchling build
 
       - name: Basic package test prior to upload
         run: |

CONTRIBUTING.md

@@ -94,7 +94,6 @@ Here's how to get started with your code contribution:
         a.  python -m venv .venv
         b.  source .venv/bin/activate
         c.  pip install -r dev_requirements.txt
-        c.  pip install -r requirements.txt
 
 4.  If you need a development environment, run `invoke devenv`. Note: this relies on docker compose to build environments, and assumes that you have a version supporting [docker profiles](https://docs.docker.com/compose/profiles/).
 5.  While developing, make sure the tests pass by running `invoke tests`

INSTALL

@@ -1,6 +1,5 @@
 
 Please use
- python setup.py install
-
-and report errors to via https://github.com/valkey-io/valkey-py/issues/new
+ pip install .
 
+and report errors to us via https://github.com/valkey-io/valkey-py/issues/new

dev_requirements.txt

@@ -4,6 +4,7 @@ click
 flake8-isort
 flake8
 flynt
+hatchling
 invoke
 mock
 packaging>=20.4
@@ -14,4 +15,3 @@ pytest-timeout
 ujson>=4.2.0
 uvloop; implementation_name != "pypy"
 vulture>=2.3.0
-wheel>=0.30.0

pyproject.toml

@@ -0,0 +1,58 @@
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+name = "valkey"
+version = "6.1.1"
+description = "Python client for Valkey forked from redis-py"
+readme = "README.md"
+license = { file = "LICENSE" }
+keywords = ["Valkey", "key-value store", "database"]
+
+authors = [
+    { name = "valkey-py authors", email = "[email protected]" }
+]
+
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Environment :: Console",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
+    "Programming Language :: Python :: Implementation :: CPython",
+    "Programming Language :: Python :: Implementation :: PyPy",
+]
+
+requires-python = ">=3.10"
+
+dependencies = [
+    'async-timeout>=4.0.3; python_full_version<"3.11.3"',
+]
+
+[project.optional-dependencies]
+libvalkey = ["libvalkey>=4.0.1"]
+ocsp = ["cryptography>=36.0.1", "pyopenssl==23.2.1", "requests>=2.31.0"]
+
+
+[project.urls]
+Homepage = "https://github.com/valkey-io/valkey-py"
+Documentation = "https://valkey-py.readthedocs.io/en/latest/"
+Changes = "https://github.com/valkey-io/valkey-py/releases"
+Code = "https://github.com/valkey-io/valkey-py"
+"Issue tracker" = "https://github.com/valkey-io/valkey-py/issues"
+
+[tool.hatch.build.targets.sdist]
+include = [
+    "/tests",
+    "/valkey",
+    "dev_requirements.txt",
+]

tasks.py

@@ -20,7 +20,7 @@ def devenv(c):
 @task
 def build_docs(c):
     """Generates the sphinx documentation."""
-    run("pip install -r docs/requirements.txt")
+    run("pip install '.[docs]'")
     run("make -C docs html")
 
 
@@ -91,4 +91,4 @@ def clean(c):
 @task
 def package(c):
     """Create the python packages"""
-    run("python setup.py sdist bdist_wheel")
+    run("hatchling build")