From c65274290b50a389f347d1e666b3256ab45e73ca Mon Sep 17 00:00:00 2001 From: Sefik Ilkin Serengil Date: Sun, 4 Feb 2024 17:02:31 +0000 Subject: [PATCH 1/2] restore version approach --- deepface/DeepFace.py | 3 --- deepface/commons/package_utils.py | 20 -------------------- package_info.json | 3 --- setup.py | 8 ++------ 4 files changed, 2 insertions(+), 32 deletions(-) delete mode 100644 package_info.json diff --git a/deepface/DeepFace.py b/deepface/DeepFace.py index 11058ac..a61702a 100644 --- a/deepface/DeepFace.py +++ b/deepface/DeepFace.py @@ -24,9 +24,6 @@ from deepface.modules import ( logger = Logger(module="DeepFace") -# current package version of deepface -__version__ = package_utils.find_package_version() - # ----------------------------------- # configurations for dependencies diff --git a/deepface/commons/package_utils.py b/deepface/commons/package_utils.py index ec766a4..9326b94 100644 --- a/deepface/commons/package_utils.py +++ b/deepface/commons/package_utils.py @@ -1,11 +1,8 @@ -import json - # 3rd party dependencies import tensorflow as tf # package dependencies from deepface.commons.logger import Logger -from deepface.commons import constant logger = Logger(module="commons.package_utils") @@ -17,20 +14,3 @@ def get_tf_major_version() -> int: major_version (int) """ return int(tf.__version__.split(".", maxsplit=1)[0]) - - -def find_package_version() -> str: - """ - Find the currenct package version - Returns: - version (str) - """ - version_info = "N/A" - try: - with open(f"{constant.ROOT_DIR}/package_info.json", "r", encoding="utf-8") as f: - package_info = json.load(f) - version_info = package_info["version"] - except Exception as err: # pylint: disable=broad-except, unused-variable - pass - - return version_info diff --git a/package_info.json b/package_info.json deleted file mode 100644 index 8d6e00f..0000000 --- a/package_info.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "version": "0.0.84" -} \ No newline at end of file diff --git a/setup.py b/setup.py index f56a292..8c70375 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,3 @@ -import json import setuptools with open("README.md", "r", encoding="utf-8") as fh: @@ -7,19 +6,16 @@ with open("README.md", "r", encoding="utf-8") as fh: with open("requirements.txt", "r", encoding="utf-8") as f: requirements = f.read().split("\n") -with open("package_info.json", "r", encoding="utf-8") as f: - package_info = json.load(f) - setuptools.setup( name="deepface", - version=package_info["version"], + version="0.0.85", author="Sefik Ilkin Serengil", author_email="serengil@gmail.com", description=( "A Lightweight Face Recognition and Facial Attribute Analysis Framework" " (Age, Gender, Emotion, Race) for Python" ), - data_files=[("", ["README.md", "requirements.txt", "package_info.json"])], + data_files=[("", ["README.md", "requirements.txt"])], long_description=long_description, long_description_content_type="text/markdown", url="https://github.com/serengil/deepface", From ecf1de59868d327bb92775c63d352870238ec417 Mon Sep 17 00:00:00 2001 From: Sefik Ilkin Serengil Date: Sun, 4 Feb 2024 17:03:24 +0000 Subject: [PATCH 2/2] droped package info in dockerfile --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ebdca15..25a9c5b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,6 @@ RUN apt-get install ffmpeg libsm6 libxext6 -y # Copy required files from repo into image COPY ./deepface /app/deepface COPY ./requirements.txt /app/ -COPY ./package_info.json /app/ COPY ./setup.py /app/ COPY ./README.md /app/