5.0.0

.github/workflows/ci.yml

@@ -0,0 +1,52 @@
+name: CI
+
+on:
+  pull_request:
+    branches: [master]
+  push:
+    branches: [master]
+
+jobs:
+  test:
+    name: Test (Python ${{ matrix.python-version }})
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v4
+        with:
+          version: "latest"
+
+      - name: Set up Python ${{ matrix.python-version }}
+        run: uv python install ${{ matrix.python-version }}
+
+      - name: Install dependencies
+        run: uv sync --dev
+
+      - name: Run tests
+        run: uv run pytest tests/ -v --cov=restea --cov-report=term-missing
+
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v4
+        with:
+          version: "latest"
+
+      - name: Set up Python
+        run: uv python install 3.12
+
+      - name: Check with ruff
+        run: uvx ruff check .

.github/workflows/publish.yml

@@ -0,0 +1,53 @@
+name: Build and Publish
+
+on:
+  push:
+    tags:
+      - '*'
+
+permissions:
+  contents: write
+
+jobs:
+  build:
+    name: Build distribution
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0  # Needed for hatch-vcs to get version from tags
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v4
+        with:
+          version: "latest"
+
+      - name: Set up Python
+        run: uv python install 3.12
+
+      - name: Build package
+        run: uv build
+
+      - name: Store distribution packages
+        uses: actions/upload-artifact@v4
+        with:
+          name: python-package-distributions
+          path: dist/
+
+  publish-to-github:
+    name: Publish to GitHub Release
+    needs: build
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Download distribution packages
+        uses: actions/download-artifact@v4
+        with:
+          name: python-package-distributions
+          path: dist/
+
+      - name: Create GitHub Release
+        uses: softprops/action-gh-release@v2
+        with:
+          files: dist/*
+          generate_release_notes: true

.gitignore

@@ -3,8 +3,10 @@
 .coverage
 htmlcov/*
 MANIFEST
-dist
+dist/
 .cache
-.eggs/*
-build/*
-restea.egg-info/*
+.eggs/
+build/
+*.egg-info/
+.venv/
+.python-version

example.py

@@ -1,10 +1,10 @@
 import random
+
 from flask import Flask
 
-from restea import errors
-from restea.resource import Resource
+from restea import errors, fields
 from restea.adapters.flaskwrap import FlaskResourceWrapper
-from restea import fields
+from restea.resource import Resource
 
 app = Flask(__name__)
 

pyproject.toml

@@ -0,0 +1,82 @@
+[build-system]
+requires = ["hatchling", "uv-dynamic-versioning"]
+build-backend = "hatchling.build"
+
+[project]
+name = "restea"
+dynamic = ["version"]
+description = "Simple RESTful server toolkit"
+readme = "README.rst"
+license = "MIT"
+requires-python = ">=3.10"
+authors = [
+    { name = "Walery Jadlowski", email = "bodb.digr@gmail.com" },
+]
+keywords = ["rest", "restful", "restea"]
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Environment :: Web Environment",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python",
+    "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",
+    "Topic :: Internet :: WWW/HTTP",
+]
+dependencies = []
+
+[project.optional-dependencies]
+dev = [
+    "pytest>=7.0",
+    "pytest-cov>=4.0",
+    "pytest-mock>=3.0",
+    "mock>=5.0",
+]
+
+[dependency-groups]
+dev = [
+    "pytest>=7.0",
+    "pytest-cov>=4.0",
+    "pytest-mock>=3.0",
+    "mock>=5.0",
+]
+
+[project.urls]
+Homepage = "https://github.com/bodbdigr/restea"
+Repository = "https://github.com/bodbdigr/restea"
+
+[tool.hatch.version]
+source = "uv-dynamic-versioning"
+
+[tool.uv-dynamic-versioning]
+fallback-version = "0.0.0"
+
+[tool.hatch.build.targets.sdist]
+include = [
+    "/restea",
+    "/README.rst",
+]
+
+[tool.hatch.build.targets.wheel]
+packages = ["restea"]
+
+[tool.pytest.ini_options]
+addopts = "--cov-report=term-missing --cov=restea"
+testpaths = ["tests"]
+
+[tool.ruff]
+target-version = "py310"
+line-length = 88
+
+[tool.ruff.lint]
+select = ["E", "F", "I"]
+ignore = ["E501"]
+
+[tool.ruff.lint.isort]
+known-first-party = ["restea"]

restea/__init__.py

@@ -1 +1,6 @@
-__version__ = '0.3.10'
+import importlib.metadata
+
+try:
+    __version__ = importlib.metadata.version(__name__)
+except importlib.metadata.PackageNotFoundError:
+    __version__ = "0.0.0"

restea/adapters/djangowrap.py

@@ -1,11 +1,9 @@
-import six
-
 from django.http import HttpResponse
 from django.urls import re_path
 
 from restea.adapters.base import (
-    BaseResourceWrapper,
     BaseRequestWrapper,
+    BaseResourceWrapper,
 )
 
 
@@ -63,7 +61,7 @@ def prepare_response(self, content, status_code, content_type, headers):
             content_type=content_type,
             status=status_code
         )
-        for name, value in six.iteritems(headers):
+        for name, value in headers.items():
             response[name] = value
         return response
 

restea/adapters/flaskwrap.py

@@ -1,10 +1,8 @@
-import six
-
 import flask
 
 from restea.adapters.base import (
-    BaseResourceWrapper,
     BaseRequestWrapper,
+    BaseResourceWrapper,
 )
 
 
@@ -73,7 +71,7 @@ def prepare_response(self, content, status_code, content_type, headers):
             mimetype=content_type,
             status=status_code
         )
-        for name, value in six.iteritems(headers):
+        for name, value in headers.items():
             response.headers[name] = value
         return response
 

restea/adapters/wheezywebwrap.py

@@ -1,12 +1,10 @@
-import six
-
 from wheezy.http import HTTPResponse
-from wheezy.routing import url
 from wheezy.http.comp import bton
+from wheezy.routing import url
 
 from restea.adapters.base import (
-    BaseResourceWrapper,
     BaseRequestWrapper,
+    BaseResourceWrapper,
 )
 from restea.errors import BadRequestError
 
@@ -76,7 +74,7 @@ def prepare_response(self, content, status_code, content_type, headers):
         response = HTTPResponse(content_type=content_type)
         response.write(content)
         response.status_code = status_code
-        for name, value in six.iteritems(headers):
+        for name, value in headers.items():
             response.headers.append((name, value))
         return response
 

restea/fields.py

@@ -1,8 +1,5 @@
-import re
 import datetime
-
-import six
-from six.moves import map
+import re
 
 
 class FieldSet(object):
@@ -219,7 +216,7 @@ def _validate_field(self, field_value):
         :returns: validated value
         :rtype: str
         '''
-        if not isinstance(field_value, six.string_types):
+        if not isinstance(field_value, str):
             raise FieldSet.Error(
                 'Field "{}" is not a string'.format(self._name)
             )
@@ -242,7 +239,7 @@ def _validate_pattern(self, option_value, field_value):
         least one pattern matches validation is passing
         '''
         res = None
-        if isinstance(option_value, six.string_types):
+        if isinstance(option_value, str):
             res = re.findall(option_value, field_value, re.IGNORECASE)
         else:
             for pattern in option_value:

restea/formats.py

@@ -2,9 +2,6 @@
 import json
 import time
 
-import six
-
-
 _formatter_registry = {}
 
 
@@ -33,7 +30,7 @@ def __init__(cls, name, bases, dict):
             _formatter_registry[cls.name] = cls
 
 
-class BaseFormatter(six.with_metaclass(FormatterRegistry)):
+class BaseFormatter(metaclass=FormatterRegistry):
     '''
     BaseFormatter is base class for different serialization formats
     '''

restea/resource.py

@@ -1,13 +1,9 @@
-from __future__ import unicode_literals
-
 import collections
 import collections.abc
 
-import six
-
 import restea.errors as errors
-import restea.formats as formats
 import restea.fields as fields
+import restea.formats as formats
 
 
 class Resource(object):
@@ -282,7 +278,7 @@ def _add_available_methods_to_response_headers(self):
 
     @classmethod
     def _stream_http_method_and_restea_method(cls):
-        for http_method, method_names in six.iteritems(cls.method_map):
+        for http_method, method_names in cls.method_map.items():
             if isinstance(method_names, tuple):
                 for method_name in method_names:
                     yield http_method, method_name