fix(test): add support for python 3.13, fix deprecated library

Author: rande

.github/README.md

@@ -7,7 +7,7 @@ This directory contains the complete CI/CD setup for the python-simple-ioc proje
 ### 🚀 Main CI Workflow (`ci.yml`)
 - **Purpose**: Primary continuous integration for every push and PR
 - **Features**:
-  - Tests against Python 3.9, 3.10, 3.11, and 3.12
+  - Tests against Python 3.9, 3.10, 3.11, 3.12, and 3.13
   - Runs flake8 linting (required to pass)
   - Executes core tests using smart dependency detection
   - Optional mypy type checking (non-blocking)
@@ -28,12 +28,6 @@ This directory contains the complete CI/CD setup for the python-simple-ioc proje
 - **Focus**: Core functionality verification
 
 
-### 📚 Documentation (`docs.yml`)
-- **Purpose**: Build and deploy documentation to GitHub Pages
-- **Features**:
-  - Builds Sphinx documentation with warnings as errors
-  - Deploys to GitHub Pages on push to main/master
-  - Uses proper GitHub Pages permissions and concurrency
 
 ### 🏷️ Release Automation (`release.yml`)
 - **Purpose**: Automated package building and PyPI publishing
@@ -75,10 +69,6 @@ Add these to your GitHub repository settings:
 - `PYPI_API_TOKEN`: Your PyPI API token for publishing releases
 - `TEST_PYPI_API_TOKEN`: Your Test PyPI API token for testing
 
-### GitHub Pages Setup
-1. Go to repository Settings → Pages
-2. Select "GitHub Actions" as the source
-3. The `docs.yml` workflow will automatically deploy documentation
 
 ### Branch Protection
 Consider setting up branch protection rules for `main`/`master`:

.github/workflows-badges.md

@@ -5,7 +5,6 @@ Add these badges to your README.md:
 ```markdown
 [![CI](https://github.com/rande/python-simple-ioc/actions/workflows/ci.yml/badge.svg)](https://github.com/rande/python-simple-ioc/actions/workflows/ci.yml)
 [![Tests](https://github.com/rande/python-simple-ioc/actions/workflows/tests.yml/badge.svg)](https://github.com/rande/python-simple-ioc/actions/workflows/tests.yml)
-[![Docs](https://github.com/rande/python-simple-ioc/actions/workflows/docs.yml/badge.svg)](https://github.com/rande/python-simple-ioc/actions/workflows/docs.yml)
 [![Test Matrix](https://github.com/rande/python-simple-ioc/actions/workflows/test-matrix.yml/badge.svg)](https://github.com/rande/python-simple-ioc/actions/workflows/test-matrix.yml)
 ```
 
@@ -14,7 +13,7 @@ Add these badges to your README.md:
 ### ci.yml
 - Main CI workflow that runs on every push and PR
 - Runs flake8 linting and the standard test suite
-- Tests against Python 3.9, 3.10, 3.11, and 3.12
+- Tests against Python 3.9, 3.10, 3.11, 3.12, and 3.13
 
 ### tests.yml
 - Comprehensive test workflow with separate jobs for:

.github/workflows/ci.yml

@@ -13,13 +13,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.9', '3.10', '3.11', '3.12']
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
 
     steps:
     - uses: actions/checkout@v4
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
 

.github/workflows/docs.yml

@@ -18,7 +18,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: '3.11'
 

.github/workflows/release.yml

@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]  # Add more OS options if needed: macos-latest, windows-latest
-        python-version: ['3.9', '3.10', '3.11', '3.12']
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
         # exclude:
         #   # Reduce matrix size by excluding some combinations
         #   - os: macos-latest
@@ -26,7 +26,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
 

.github/workflows/test-matrix.yml

@@ -11,13 +11,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.9', '3.10', '3.11', '3.12']
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
 
     steps:
     - uses: actions/checkout@v4
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
 
@@ -39,13 +39,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.9', '3.10', '3.11', '3.12']
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
 
     steps:
     - uses: actions/checkout@v4
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
 
@@ -82,7 +82,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
 
@@ -118,9 +118,11 @@ jobs:
                 missing.append(extra)
         
         if test_exists and not missing:
-            print('::set-output name=should_run::true')
+            with open(os.environ['GITHUB_OUTPUT'], 'a') as f:
+                f.write('should_run=true\\n')
         else:
-            print('::set-output name=should_run::false')
+            with open(os.environ['GITHUB_OUTPUT'], 'a') as f:
+                f.write('should_run=false\\n')
             if missing:
                 print(f'Missing dependencies: {missing}')
             if not test_exists:
@@ -137,13 +139,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.9', '3.12']
+        python-version: ['3.9', '3.13']
 
     steps:
     - uses: actions/checkout@v4
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
 
@@ -229,7 +231,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: '3.11'
 
@@ -244,7 +246,7 @@ jobs:
         sphinx-build -nW -b html -d docs/_build/doctrees docs docs/_build/html
     
     - name: Upload documentation artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: documentation
         path: docs/_build/html/
@@ -257,7 +259,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: '3.11'
 

.github/workflows/tests.yml

@@ -85,20 +85,44 @@ class PackageLocator(BaseLocator):
     If the package path is not given, ``'resources'`` is assumed.
     """
 
-    def __init__(self, package_name, package_path='resources'):
-        from pkg_resources import ResourceManager, get_provider
-        self.manager = ResourceManager()
-        self.provider = get_provider(package_name)
+    def __init__(self, package_name: str, package_path: str = 'resources') -> None:
+        try:
+            # Python 3.9+
+            from importlib import resources
+            self.resources = resources
+        except ImportError:
+            # Fallback for older Python versions
+            import importlib_resources as resources
+            self.resources = resources
+        
+        self.package_name = package_name
         self.package_path = package_path
 
-    def locate(self, resource):
+    def locate(self, resource: str) -> str:
         pieces = split_resource_path(resource)
-        p = '/'.join((self.package_path,) + tuple(pieces))
-        if not self.provider.has_resource(p):
+        
+        try:
+            # Try to access the resource
+            package = self.resources.files(self.package_name)
+            if self.package_path:
+                package = package / self.package_path
+            
+            for piece in pieces:
+                package = package / piece
+            
+            if not package.is_file():
+                raise ResourceNotFound(resource)
+            
+            # For Python 3.9+, we need to handle the path properly
+            if hasattr(package, '__fspath__'):
+                return str(package)
+            else:
+                # Use as_file context manager for temporary access
+                with self.resources.as_file(package) as path:
+                    return str(path)
+        except (AttributeError, FileNotFoundError, ModuleNotFoundError):
             raise ResourceNotFound(resource)
 
-        return self.provider.get_resource_filename(self.manager, p)
-
 class FunctionLocator(BaseLocator):
     """A locator that is passed a function which does the searching.  The
     function becomes the name of the resource passed and has to return

ioc/locator.py

@@ -7,7 +7,7 @@ name = "ioc"
 version = "0.0.16"
 description = "A small dependency injection container based on Symfony2 Dependency Component"
 readme = "README.txt"
-license = {file = "LICENSE"}
+license = "Apache-2.0"
 authors = [
     {name = "Thomas Rabaix", email = "[email protected]"}
 ]
@@ -29,6 +29,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Topic :: Utilities",
 ]
@@ -96,12 +97,12 @@ ignore_errors = false
 module = [
     "yaml.*",
     "werkzeug.*",
-    "pkg_resources.*",
     "element.*",
     "tornado.*",
     "redis.*",
     "jinja2.*",
     "flask.*",
+    "importlib_resources.*",
 ]
 ignore_missing_imports = true