From 5a8a2d7984c36606c39329d67c648c0750daa8b7 Mon Sep 17 00:00:00 2001 From: touero Date: Fri, 29 Nov 2024 16:46:36 +0800 Subject: [PATCH 1/3] fix: entry point error in easier-docker cli Traceback (most recent call last): File "/home/weiensong/data/code/personal/easier-docker/venv/bin/easier_docker", line 5, in from easierdocker.__main__ import main ModuleNotFoundError: No module named 'easierdocker' --- .gitignore | 3 ++- Makefile | 2 ++ pyproject.toml | 4 ---- {easierdocker => src/easierdocker}/__init__.py | 1 + {easierdocker => src/easierdocker}/__main__.py | 4 +--- {easierdocker => src/easierdocker}/config.py | 2 +- {easierdocker => src/easierdocker}/constants.py | 0 {easierdocker => src/easierdocker}/docker_utils.py | 0 {easierdocker => src/easierdocker}/easier_docker.py | 0 {easierdocker => src/easierdocker}/easier_docker.pyi | 0 {easierdocker => src/easierdocker}/exceptions.py | 0 {easierdocker => src/easierdocker}/log_re.py | 0 {easierdocker => src/easierdocker}/reload_process.py | 0 tests/test_easier_docker.py | 2 ++ 14 files changed, 9 insertions(+), 9 deletions(-) rename {easierdocker => src/easierdocker}/__init__.py (76%) rename {easierdocker => src/easierdocker}/__main__.py (84%) rename {easierdocker => src/easierdocker}/config.py (93%) rename {easierdocker => src/easierdocker}/constants.py (100%) rename {easierdocker => src/easierdocker}/docker_utils.py (100%) rename {easierdocker => src/easierdocker}/easier_docker.py (100%) rename {easierdocker => src/easierdocker}/easier_docker.pyi (100%) rename {easierdocker => src/easierdocker}/exceptions.py (100%) rename {easierdocker => src/easierdocker}/log_re.py (100%) rename {easierdocker => src/easierdocker}/reload_process.py (100%) diff --git a/.gitignore b/.gitignore index 028b49a..8b4b5df 100644 --- a/.gitignore +++ b/.gitignore @@ -4,8 +4,9 @@ __pycache__/ dist/ easier_docker.egg-info/ example.egg-info/ +easierdocker/easier_docker.egg-info/ venv/ +.venv/ build/ .coverage htmlcov -easierdocker/easier_docker.egg-info/ diff --git a/Makefile b/Makefile index 03c3e19..8970269 100644 --- a/Makefile +++ b/Makefile @@ -14,6 +14,8 @@ test: clean: find . -name '__pycache__' -type d -exec rm -rf {} + find . -name 'easier_docker.egg-info' -type d -exec rm -rf {} + + find . -name 'example.egg-info' -type d -exec rm -rf {} + + rm -rf htmlcov rm -rf build rm -rf dist rm -rf .coverage diff --git a/pyproject.toml b/pyproject.toml index 733006e..691a40d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,10 +3,6 @@ requires = ["setuptools>=68.2.0", "wheel>=0.42.0"] build-backend = "setuptools.build_meta" -[tool.setuptools.packages] -find = { where = ["easierdocker"] } - - [project] name = "easier-docker" version = "2.2.4" diff --git a/easierdocker/__init__.py b/src/easierdocker/__init__.py similarity index 76% rename from easierdocker/__init__.py rename to src/easierdocker/__init__.py index 3158651..a8dd263 100644 --- a/easierdocker/__init__.py +++ b/src/easierdocker/__init__.py @@ -1,4 +1,5 @@ from .easier_docker import EasierDocker from .log_re import log +from .config import Config __version__ = '2.2.4' diff --git a/easierdocker/__main__.py b/src/easierdocker/__main__.py similarity index 84% rename from easierdocker/__main__.py rename to src/easierdocker/__main__.py index da7085f..12b0b16 100644 --- a/easierdocker/__main__.py +++ b/src/easierdocker/__main__.py @@ -2,9 +2,7 @@ import os from argparse import ArgumentParser -from easierdocker.config import Config -from easierdocker.log_re import log -from easierdocker.easier_docker import EasierDocker +from . import EasierDocker, log, Config def main(): diff --git a/easierdocker/config.py b/src/easierdocker/config.py similarity index 93% rename from easierdocker/config.py rename to src/easierdocker/config.py index 249da1e..f67c669 100644 --- a/easierdocker/config.py +++ b/src/easierdocker/config.py @@ -1,7 +1,7 @@ import json import yaml -from easierdocker.log_re import log +from . import log class Config: diff --git a/easierdocker/constants.py b/src/easierdocker/constants.py similarity index 100% rename from easierdocker/constants.py rename to src/easierdocker/constants.py diff --git a/easierdocker/docker_utils.py b/src/easierdocker/docker_utils.py similarity index 100% rename from easierdocker/docker_utils.py rename to src/easierdocker/docker_utils.py diff --git a/easierdocker/easier_docker.py b/src/easierdocker/easier_docker.py similarity index 100% rename from easierdocker/easier_docker.py rename to src/easierdocker/easier_docker.py diff --git a/easierdocker/easier_docker.pyi b/src/easierdocker/easier_docker.pyi similarity index 100% rename from easierdocker/easier_docker.pyi rename to src/easierdocker/easier_docker.pyi diff --git a/easierdocker/exceptions.py b/src/easierdocker/exceptions.py similarity index 100% rename from easierdocker/exceptions.py rename to src/easierdocker/exceptions.py diff --git a/easierdocker/log_re.py b/src/easierdocker/log_re.py similarity index 100% rename from easierdocker/log_re.py rename to src/easierdocker/log_re.py diff --git a/easierdocker/reload_process.py b/src/easierdocker/reload_process.py similarity index 100% rename from easierdocker/reload_process.py rename to src/easierdocker/reload_process.py diff --git a/tests/test_easier_docker.py b/tests/test_easier_docker.py index 70c2fff..07a2efd 100644 --- a/tests/test_easier_docker.py +++ b/tests/test_easier_docker.py @@ -1,11 +1,13 @@ import unittest from unittest.mock import patch, MagicMock +from src.easierdocker import EasierDocker from docker.errors import ImageNotFound, APIError, NotFound, DockerException from easierdocker import EasierDocker from easierdocker.exceptions import DockerConnectionError, NotFoundImageInDockerHub + class TestEasierDocker(unittest.TestCase): def setUp(self): self.container_config = { From 60691fd65ddab8d2b72736b818cdbec0595f9049 Mon Sep 17 00:00:00 2001 From: touero Date: Fri, 29 Nov 2024 16:50:50 +0800 Subject: [PATCH 2/3] fix: test case import error --- tests/test_easier_docker.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/test_easier_docker.py b/tests/test_easier_docker.py index 07a2efd..d032027 100644 --- a/tests/test_easier_docker.py +++ b/tests/test_easier_docker.py @@ -3,9 +3,7 @@ from src.easierdocker import EasierDocker from docker.errors import ImageNotFound, APIError, NotFound, DockerException -from easierdocker import EasierDocker -from easierdocker.exceptions import DockerConnectionError, NotFoundImageInDockerHub - +from src.easierdocker.exceptions import DockerConnectionError, NotFoundImageInDockerHub class TestEasierDocker(unittest.TestCase): From 72d7703a16cbce5bbda817ca4948372dbbc96337 Mon Sep 17 00:00:00 2001 From: touero Date: Fri, 29 Nov 2024 16:53:11 +0800 Subject: [PATCH 3/3] chore: update version --- pyproject.toml | 2 +- src/easierdocker/__init__.py | 2 +- tests/__init__.py | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 tests/__init__.py diff --git a/pyproject.toml b/pyproject.toml index 691a40d..a62df5b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta" [project] name = "easier-docker" -version = "2.2.4" +version = "2.2.5" description = "Configure your container image information more easily in python, allowing the container in docker to execute the configured program you want to execute." readme = "README.md" requires-python = ">=3.8" diff --git a/src/easierdocker/__init__.py b/src/easierdocker/__init__.py index a8dd263..cf66821 100644 --- a/src/easierdocker/__init__.py +++ b/src/easierdocker/__init__.py @@ -2,4 +2,4 @@ from .log_re import log from .config import Config -__version__ = '2.2.4' +__version__ = '2.2.5' diff --git a/tests/__init__.py b/tests/__init__.py deleted file mode 100644 index 2d5ba17..0000000 --- a/tests/__init__.py +++ /dev/null @@ -1 +0,0 @@ -import docker