chore(*): Remove Python 3.7 and Python 3.8 support and add Python 3.11, Python 3.12 and Python 3.13 support

Author: Denis Navarro

.github/workflows/cd.yml

@@ -15,10 +15,10 @@ jobs:
     env:
       VERSION: ${{ github.event.inputs.release_version }}
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
-          python-version: '3.12'
+          python-version: '3.13'
       - name: version
         run: sed -i "s/__version__ = '.*'/__version__ = '$VERSION'/g" aiodi/__init__.py
       - name: deps

.github/workflows/ci.yml

@@ -14,10 +14,10 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest ]
-        python-version: [ '3.8', '3.9', '3.10', '3.11', '3.12' ]
+        python-version: [ 3.9', '3.10', '3.11', '3.12', '3.13 ]
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: deps

Containerfile

@@ -0,0 +1,27 @@
+FROM docker.io/library/python:3.9-slim AS production
+
+WORKDIR /app
+
+RUN apt update -y && apt upgrade -y
+RUN --mount=type=cache,target=/root/.cache/pip python3 -m pip install --upgrade pip
+
+COPY LICENSE README.md pyproject.toml ./
+COPY aiodi ./aiodi/
+
+RUN --mount=type=cache,target=/root/.cache/pip python3 -m pip install .
+
+ENTRYPOINT ["python3"]
+CMD []
+
+FROM production AS development
+
+RUN apt install -y gcc
+
+COPY .pre-commit-config.yaml run-script ./
+
+RUN --mount=type=cache,target=/root/.cache/pip python3 run-script dev-install
+
+COPY docs_src ./docs_src
+COPY tests ./tests
+
+ENTRYPOINT ["python3", "run-script"]

Dockerfile

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 - 2023 aiopy
+Copyright (c) 2022 - 2024 aiopy
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

LICENSE

@@ -167,7 +167,7 @@ if __name__ == '__main__':
 
 ## Requirements
 
-- Python >= 3.8
+- Python >= 3.9
 
 ## Contributing
 

README.md

@@ -55,7 +55,7 @@ def __init__(
             'variable': VariableResolver(),
         }
         self._decoders = {
-            'toml': lambda path: (toml_decoder or lazy_toml_decoder())(path).get('tool', {}).get(tool_key, {}),  # type: ignore
+            'toml': lambda path: (toml_decoder or lazy_toml_decoder())(path).get('tool', {}).get(tool_key, {}),
         }
 
         def map_items(items: Dict[str, Dict[str, Any]]) -> List[Tuple[str, Any, Dict[str, Any]]]:

aiodi/builder.py

@@ -47,7 +47,7 @@ def resolve_parameter(self, fn: Callable[['Container'], Any]) -> Tuple[int, Call
         return len(self._parameter_resolvers) - 1, fn
 
     def resolve(self, items: List[Union[ContainerKey, Tuple[ContainerKey, _T, Dict[str, Any]]]]) -> None:
-        items_ = list(map(self._sanitize_item_before_resolve, items))
+        items_: List[Any] = list(map(self._sanitize_item_before_resolve, items))
         while items_:
             for index, item in enumerate(items_):
                 # Check if already exist
@@ -68,7 +68,7 @@ def resolve(self, items: List[Union[ContainerKey, Tuple[ContainerKey, _T, Dict[s
                 if kwargs is not None:
                     if self.debug:
                         logger.debug('Resolving {0}'.format(item[1]))
-                    inst = item[1](**kwargs)  # type: ignore
+                    inst = item[1](**kwargs)
                     if self.debug:
                         logger.debug('Adding {0} - {1}'.format(item[0], item[1]))
                     self.set(item[0], inst)
@@ -162,7 +162,7 @@ def _sanitize_item_before_resolve(
         if length == 2:
             return item[0], item[1], {}
         if length >= 3:
-            return item[:3]  # type: ignore
+            return item[:3]
         raise ValueError('Tuple must be at least of one item')
 
     def _resolve_or_postpone_item(

aiodi/container.py

@@ -2,10 +2,8 @@ services:
   aiodi:
     build:
       context: .
-      dockerfile: Dockerfile
+      dockerfile: Containerfile
       target: development
     image: ghcr.io/aiopy/python-aiodi:${VERSION:-latest}
     volumes:
       - .:/app
-
-version: "3.8"

docker-compose.yml renamed to compose.yml

@@ -10,7 +10,7 @@ Key Features:
 
 ## Requirements
 
-- Python 3.8+
+- Python 3.9+
 
 ## Installation
 

docs_src/docs/en/index.md

@@ -10,7 +10,7 @@ Funcionalidades clave:
 
 ## Requisitos
 
-- Python 3.8+
+- Python 3.9+
 
 ## Instalación
 

docs_src/docs/es/index.md

@@ -418,7 +418,7 @@ <h1 id="aiodi">AIODI</h1>
 </ul>
 <h2 id="requirements">Requirements</h2>
 <ul>
-<li>Python 3.8+</li>
+<li>Python 3.9+</li>
 </ul>
 <h2 id="installation">Installation</h2>
 <div class="highlight"><pre><span></span><code>python3 -m pip install aiodi
@@ -609,4 +609,4 @@ <h2 id="license">License</h2>
 
 
   </body>
-</html>
+</html>

docs_src/generated/en/index.html

@@ -11,7 +11,7 @@
     "docs": [
         {
             "location": "",
-            "text": "AIODI A modern Python Dependency Injection library that allows you to standardize and centralize the way objects are constructed in your application highly inspired on PHP Symfony's DependencyInjection Component . Key Features: Standard-based : Implements PEP 621 storing project metadata in pyproject.toml . Dual mode : Setting dependencies using Python and using configuration files . Clean : Wherever you want just use it, no more decorators and defaults everywhere . Requirements Python 3.8+ Installation python3 -m pip install aiodi Example using Configuration Files # sample/pyproject.toml [tool.aiodi.variables] name = \"%env(str:APP_NAME, 'sample')%\" version = \"%env(int:APP_VERSION, '1')%\" log_level = \"%env(APP_LEVEL, 'INFO')%\" [tool.aiodi.services.\"_defaults\"] project_dir = \"../../..\" [tool.aiodi.services.\"logging.Logger\"] class = \"sample.libs.utils.get_simple_logger\" arguments = { name = \"%var(name)%\" , level = \"%var(log_level)%\" } [tool.aiodi.services.\"UserLogger\"] type = \"sample.libs.users.infrastructure.in_memory_user_logger.InMemoryUserLogger\" arguments = { commands = \"@logging.Logger\" } [tool.aiodi.services.\"*\"] _defaults = { autoregistration = { resource = \"sample/libs/*\" , exclude = \"sample/libs/users/{domain,infrastructure/in_memory_user_logger.py,infrastructure/*command.py}\" } } # sample/apps/settings.py from typing import Optional from aiodi import Container , ContainerBuilder def container ( filename : str , cwd : Optional [ str ] = None ) -> Container : return ContainerBuilder ( filenames = [ filename ], cwd = cwd ) . load () # sample/apps/cli/main.py from sample.apps.settings import container from logging import Logger def main () -> None : di = container ( filename = '../../pyproject.toml' ) di . get ( Logger ) . info ( 'Just simple call get with the type' ) di . get ( 'UserLogger' ) . logger () . info ( 'Just simple call get with the service name' ) Example using Python from abc import ABC , abstractmethod from logging import Logger , getLogger , NOTSET , StreamHandler , Formatter from os import getenv from aiodi import Container from typing import Optional , Union _CONTAINER : Optional [ Container ] = None def get_simple_logger ( name : Optional [ str ] = None , level : Union [ str , int ] = NOTSET , fmt : str = '[ %(asctime)s ] - %(name)s - %(levelname)s - %(message)s ' , ) -> Logger : logger = getLogger ( name ) logger . setLevel ( level ) handler = StreamHandler () handler . setLevel ( level ) formatter = Formatter ( fmt ) handler . setFormatter ( formatter ) logger . addHandler ( handler ) return logger class GreetTo ( ABC ): @abstractmethod def __call__ ( self , who : str ) -> None : pass class GreetToWithPrint ( GreetTo ): def __call__ ( self , who : str ) -> None : print ( 'Hello ' + who ) class GreetToWithLogger ( GreetTo ): _logger : Logger def __init__ ( self , logger : Logger ) -> None : self . _logger = logger def __call__ ( self , who : str ) -> None : self . _logger . info ( 'Hello ' + who ) def container () -> Container : global _CONTAINER if _CONTAINER : return _CONTAINER di = Container ({ 'env' : { 'name' : getenv ( 'APP_NAME' , 'aiodi' ), 'log_level' : getenv ( 'APP_LEVEL' , 'INFO' ), }}) di . resolve ([ ( Logger , get_simple_logger , { 'name' : di . resolve_parameter ( lambda di_ : di_ . get ( 'env.name' , typ = str )), 'level' : di . resolve_parameter ( lambda di_ : di_ . get ( 'env.log_level' , typ = str )), }, ), ( GreetTo , GreetToWithLogger ), # -> (GreetTo, GreetToWithLogger, {}) GreetToWithPrint , # -> (GreetToWithPrint, GreetToWithPrint, {}) ]) di . set ( 'who' , 'World!' ) # ... _CONTAINER = di return di def main () -> None : di = container () di . get ( Logger ) . info ( 'Just simple call get with the type' ) for greet_to in di . get ( GreetTo , instance_of = True ): greet_to ( di . get ( 'who' )) if __name__ == '__main__' : main () License MIT",
+            "text": "AIODI A modern Python Dependency Injection library that allows you to standardize and centralize the way objects are constructed in your application highly inspired on PHP Symfony's DependencyInjection Component . Key Features: Standard-based : Implements PEP 621 storing project metadata in pyproject.toml . Dual mode : Setting dependencies using Python and using configuration files . Clean : Wherever you want just use it, no more decorators and defaults everywhere . Requirements Python 3.9+ Installation python3 -m pip install aiodi Example using Configuration Files # sample/pyproject.toml [tool.aiodi.variables] name = \"%env(str:APP_NAME, 'sample')%\" version = \"%env(int:APP_VERSION, '1')%\" log_level = \"%env(APP_LEVEL, 'INFO')%\" [tool.aiodi.services.\"_defaults\"] project_dir = \"../../..\" [tool.aiodi.services.\"logging.Logger\"] class = \"sample.libs.utils.get_simple_logger\" arguments = { name = \"%var(name)%\" , level = \"%var(log_level)%\" } [tool.aiodi.services.\"UserLogger\"] type = \"sample.libs.users.infrastructure.in_memory_user_logger.InMemoryUserLogger\" arguments = { commands = \"@logging.Logger\" } [tool.aiodi.services.\"*\"] _defaults = { autoregistration = { resource = \"sample/libs/*\" , exclude = \"sample/libs/users/{domain,infrastructure/in_memory_user_logger.py,infrastructure/*command.py}\" } } # sample/apps/settings.py from typing import Optional from aiodi import Container , ContainerBuilder def container ( filename : str , cwd : Optional [ str ] = None ) -> Container : return ContainerBuilder ( filenames = [ filename ], cwd = cwd ) . load () # sample/apps/cli/main.py from sample.apps.settings import container from logging import Logger def main () -> None : di = container ( filename = '../../pyproject.toml' ) di . get ( Logger ) . info ( 'Just simple call get with the type' ) di . get ( 'UserLogger' ) . logger () . info ( 'Just simple call get with the service name' ) Example using Python from abc import ABC , abstractmethod from logging import Logger , getLogger , NOTSET , StreamHandler , Formatter from os import getenv from aiodi import Container from typing import Optional , Union _CONTAINER : Optional [ Container ] = None def get_simple_logger ( name : Optional [ str ] = None , level : Union [ str , int ] = NOTSET , fmt : str = '[ %(asctime)s ] - %(name)s - %(levelname)s - %(message)s ' , ) -> Logger : logger = getLogger ( name ) logger . setLevel ( level ) handler = StreamHandler () handler . setLevel ( level ) formatter = Formatter ( fmt ) handler . setFormatter ( formatter ) logger . addHandler ( handler ) return logger class GreetTo ( ABC ): @abstractmethod def __call__ ( self , who : str ) -> None : pass class GreetToWithPrint ( GreetTo ): def __call__ ( self , who : str ) -> None : print ( 'Hello ' + who ) class GreetToWithLogger ( GreetTo ): _logger : Logger def __init__ ( self , logger : Logger ) -> None : self . _logger = logger def __call__ ( self , who : str ) -> None : self . _logger . info ( 'Hello ' + who ) def container () -> Container : global _CONTAINER if _CONTAINER : return _CONTAINER di = Container ({ 'env' : { 'name' : getenv ( 'APP_NAME' , 'aiodi' ), 'log_level' : getenv ( 'APP_LEVEL' , 'INFO' ), }}) di . resolve ([ ( Logger , get_simple_logger , { 'name' : di . resolve_parameter ( lambda di_ : di_ . get ( 'env.name' , typ = str )), 'level' : di . resolve_parameter ( lambda di_ : di_ . get ( 'env.log_level' , typ = str )), }, ), ( GreetTo , GreetToWithLogger ), # -> (GreetTo, GreetToWithLogger, {}) GreetToWithPrint , # -> (GreetToWithPrint, GreetToWithPrint, {}) ]) di . set ( 'who' , 'World!' ) # ... _CONTAINER = di return di def main () -> None : di = container () di . get ( Logger ) . info ( 'Just simple call get with the type' ) for greet_to in di . get ( GreetTo , instance_of = True ): greet_to ( di . get ( 'who' )) if __name__ == '__main__' : main () License MIT",
             "title": "aiodi"
         },
         {
@@ -21,7 +21,7 @@
         },
         {
             "location": "#requirements",
-            "text": "Python 3.8+",
+            "text": "Python 3.9+",
             "title": "Requirements"
         },
         {
@@ -45,4 +45,4 @@
             "title": "License"
         }
     ]
-}
+}

docs_src/generated/en/search/search_index.json

@@ -418,7 +418,7 @@ <h1 id="aiodi">AIODI</h1>
 </ul>
 <h2 id="requisitos">Requisitos</h2>
 <ul>
-<li>Python 3.8+</li>
+<li>Python 3.9+</li>
 </ul>
 <h2 id="instalacion">Instalación</h2>
 <div class="highlight"><pre><span></span><code>python3 -m pip install aiodi
@@ -609,4 +609,4 @@ <h2 id="licencia">Licencia</h2>
 
 
   </body>
-</html>
+</html>