Upgrade Version

- Move from pipenv to poetry
- Remove unused_imports from mypy options
- Upgrade 3.8

.github/workflows/pythonpublish.yml

@@ -12,7 +12,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v4
       with:
-        python-version: '3.7'
+        python-version: '3.8'
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip

.github/workflows/test.yml

@@ -24,4 +24,4 @@ jobs:
         env:
           PYTHONPATH: ${PYTHONPATH}:${PWD}:src/
         run: |
-          pipenv run make run-tests
+          pipenv run make tests

Dockerfile

@@ -1,19 +1,22 @@
-ARG PYTHON_VERSION=3.8.16
-FROM python:$PYTHON_VERSION
+ARG PYTHON_VERSION=3.8.12
+FROM python:$PYTHON_VERSION-slim
 
 ENV PYTHONPATH /app/src:/app/tests
-ENV PATH /root/.local/bin/:$PYENV_ROOT/bin/:$PATH
+ENV PATH /root/.local/bin:$PATH
 
-WORKDIR /app/
-COPY . /app/
+WORKDIR /app
 
 RUN apt-get update \
       && apt-get install -y --no-install-recommends curl \
       && rm -rf /var/lib/apt/lists/* \
       && pip install --upgrade pip \
       && adduser -u 1000 --gecos "" --disabled-password fever \
-      && chown -R fever:fever /app
-RUN pip install pipenv
-RUN pipenv install --dev --system
+      && chown -R fever:fever /app \
+      && curl -sSL https://install.python-poetry.org | POETRY_VERSION=1.2.0 python - \
+      && poetry config virtualenvs.create false
 
-CMD ["python"]
+COPY . ./
+
+RUN poetry install --no-root
+
+ENTRYPOINT ["poetry", "run"]

Makefile

@@ -1,8 +1,8 @@
 ifneq ($(docker),0)
-    DOCKER_CMD := docker build -t pypendency-image . && docker run --rm -v $(PWD):/app pypendency-image
+    DOCKER_CMD := docker-compose run --rm pypendency
 endif
 
-run-tests:
+tests:
 	$(DOCKER_CMD) python -m unittest
 
 pipenv-lock:

docker-compose.yml

@@ -0,0 +1,9 @@
+version: "3.7"
+services:
+  pypendency:
+    container_name: "pypendency"
+    build:
+      context: .
+      dockerfile: Dockerfile
+    volumes:
+      - .:/app

pyproject.toml

@@ -1,3 +1,35 @@
+[tool.poetry]
+version="0.5.0"
+name = "pypendency"
+authors= ["Miguel G. Flores<miguel.gonzalez@feverup.com>"]
+description = "Dependency injection tool"
+readme = "README.md"
+license = "MIT License"
+classifiers=[
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python :: 3.7",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Operating System :: OS Independent",
+    "Topic :: Software Development :: Libraries",
+    "Typing :: Typed",
+]
+[tool.poetry.dependencies]
+python = "^3.8.0"
+PyYAML= "^6.0"
+
+[tool.poetry.dev-dependencies]
+black = "~23.3.0"
+mypy = "~1.3.0"
+flake8 = "~5.0.4"
+types-PyYAML = "~6.0.12.10"
+
+[build-system]
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"
+
 [tool.black]
 line-length = 120
 target_version = ['py38', 'py39']
@@ -9,10 +41,4 @@ exclude = '''
       | \.tox
       | \.venv
     )/
-    '''
-
-[tool.mypy]
-ignore_missing_imports = true
-exclude = [
-    'yaml'
-]
+    '''

setup.py

@@ -6,7 +6,7 @@
 
 setup(
     name='pypendency',
-    version='0.3.0',
+    version='0.6.0',
     packages=find_packages('src'),
     package_dir={'': 'src'},
     author='Fever - Platform Squad',
@@ -20,13 +20,15 @@
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
-        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
         'Operating System :: OS Independent',
         'Topic :: Software Development :: Libraries',
         'Typing :: Typed',
     ],
-    python_requires='>=3.7',
+    python_requires='>=3.8',
     install_requires=[
         'pyyaml',
     ],

src/pypendency/loaders/yaml_loader.py

@@ -10,7 +10,7 @@
 
 
 class YamlLoader(Loader):
-    def __init__(self, container: ContainerBuilder):
+    def __init__(self, container: ContainerBuilder) ->None:
         self.__container = container
 
     def load(self, resource: str) -> None: