Fix bug than entry point error in easier-docker cli merge pull request …

…#24 from touero/develop Fix bug than entry point error in easier-docker cli
touero · Nov 29, 2024 · 44a9146 · 44a9146
2 parents 0b78ca8 + 72d7703
commit 44a9146
Show file tree

Hide file tree

Showing 15 changed files with 11 additions and 14 deletions.
diff --git 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
@@ -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
@@ -3,13 +3,9 @@ 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"
+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/easierdocker/__init__.py → src/easierdocker/__init__.py b/easierdocker/__init__.py → 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'
+__version__ = '2.2.5'
diff --git a/easierdocker/__main__.py → src/easierdocker/__main__.py b/easierdocker/__main__.py → 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 → src/easierdocker/config.py b/easierdocker/config.py → 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 → src/easierdocker/constants.py b/easierdocker/constants.py → src/easierdocker/constants.py
diff --git a/easierdocker/docker_utils.py → src/easierdocker/docker_utils.py b/easierdocker/docker_utils.py → src/easierdocker/docker_utils.py
diff --git a/easierdocker/easier_docker.py → src/easierdocker/easier_docker.py b/easierdocker/easier_docker.py → src/easierdocker/easier_docker.py
diff --git a/easierdocker/easier_docker.pyi → src/easierdocker/easier_docker.pyi b/easierdocker/easier_docker.pyi → src/easierdocker/easier_docker.pyi
diff --git a/easierdocker/exceptions.py → src/easierdocker/exceptions.py b/easierdocker/exceptions.py → src/easierdocker/exceptions.py
diff --git a/easierdocker/log_re.py → src/easierdocker/log_re.py b/easierdocker/log_re.py → src/easierdocker/log_re.py
diff --git a/easierdocker/reload_process.py → src/easierdocker/reload_process.py b/easierdocker/reload_process.py → src/easierdocker/reload_process.py
diff --git a/tests/__init__.py b/tests/__init__.py
diff --git a/tests/test_easier_docker.py b/tests/test_easier_docker.py
@@ -1,9 +1,9 @@
 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
+from src.easierdocker.exceptions import DockerConnectionError, NotFoundImageInDockerHub
 
 
 class TestEasierDocker(unittest.TestCase):