DearPyGUIの依存バージョンを更新。

Author: Kazuhito00

README.md

@@ -10,13 +10,10 @@
 ノードは作成者(高橋)が必要になった順に追加しているため、<br>
 画像処理における基本的な処理を担うノードが不足していることがあります。<br>
 
-# Requirement
-> **Warning**<br>
-> 2023/5/22時点：`dearpygui`を`1.9.1`にアップデートするとノード接続が出来ないため<br>`1.9.0`以下をインストールしてください ※原因調査中
 ```
 opencv-python   4.5.5.64 or later
 onnxruntime-gpu 1.12.0   or later
-dearpygui       1.9.0    or later
+dearpygui       1.11.0   or later
 mediapipe       0.8.10   or later ※mediapipeノード実行に必要
 protobuf        3.20.0   or later ※mediapipeノード実行に必要
 filterpy        1.4.5    or later ※motpyノード実行に必要

README_EN.md

@@ -10,15 +10,10 @@ It is used for processing verification and comparison.<br>
 Since the nodes are added in the order in which the author(Takahashi) needs them,<br>
 There may be a shortage of nodes responsible for basic processing in image processing.<br>
 
-# Requirement
-
-> **Warning**<br>
-> As of May 22, 2023: If you update `dearpygui` to `1.9.1`, you will not be able to connect to the node<br>Please install `1.9.0` or below *Under investigation
-
 ```
 opencv-python   4.5.5.64 or later
 onnxruntime-gpu 1.12.0   or later
-dearpygui       1.9.0    or later
+dearpygui       1.11.0   or later
 mediapipe       0.8.10   or later ※Required to run mediapipe node
 protobuf        3.20.0   or later ※Required to run mediapipe node
 filterpy        1.4.5    or later ※Required to run MOT(motpy) node

docker/nvidia-gpu/Dockerfile

@@ -21,12 +21,12 @@ RUN pip install --upgrade pip
 RUN pip install --upgrade cython numpy==1.23.5
 
 RUN pip install \
-opencv-contrib-python==4.5.5.64 \
-onnxruntime-gpu==1.12.0 \
-dearpygui==1.9.0 \
-mediapipe==0.8.10 \
-protobuf==3.20.0 \
-filterpy==1.4.5 \
+opencv-contrib-python>=4.5.5.64 \
+onnxruntime-gpu>=1.12.0 \
+dearpygui>=1.11.0 \
+mediapipe>=0.8.10 \
+protobuf>=3.20.0 \
+filterpy>=1.4.5 \
 
 WORKDIR /workspace
 CMD ["python3", "main.py"]

requirements.txt

@@ -1,7 +1,6 @@
-opencv-contrib-python==4.5.5.64
-onnxruntime-gpu==1.12.0
-dearpygui==1.9.0
-mediapipe==0.8.10
-protobuf==3.20.0
-filterpy==1.4.5
-
+opencv-contrib-python>=4.5.5.64
+onnxruntime-gpu>=1.12.0
+dearpygui>=1.11.0
+mediapipe>=0.8.10
+protobuf>=3.20.0
+filterpy>=1.4.5

setup.py

@@ -8,22 +8,19 @@
 
 package_keyword = "ipn_editor"
 
-
 def get_version():
     with open("__init__.py", "r") as f:
         version = re.search(r'^__version__\s*=\s*[\'"]([^\'"]*)[\'"]',
                             f.read(), re.MULTILINE).group(1)
     return version
 
-
 def package_files(directory):
     paths = []
     for (path, directories, filenames) in os.walk(directory):
         for filename in filenames:
             paths.append(os.path.join('..', path, filename))
     return paths
 
-
 extra_py_files = package_files("node") + package_files("node_editor")
 
 readme_path = path.abspath(path.dirname(__file__))
@@ -33,7 +30,7 @@ def package_files(directory):
 setup(
     name="ipn-editor",
     packages=find_packages(),
-    py_modules=[splitext(basename(path))[0] for path in glob("./*")],
+    py_modules=[splitext(basename(path))[0] for path in glob("./*") if path.endswith('.py')],
     package_data={"node_editor": extra_py_files},
     include_package_data=True,
     version=get_version(),
@@ -45,24 +42,24 @@ def package_files(directory):
     long_description_content_type='text/markdown',
     keywords='opencv node-editor onnx onnxruntime dearpygui',
     license="Apache-2.0 license",
-    python_requires=">=3.7",
+    python_requires=">=3.7, <4",
     install_requires=[
-        "numpy>=1.21.6", "Cython==0.29.30", "opencv-python==4.5.5.64",
-        "onnxruntime-gpu==1.12.0", "dearpygui==1.6.2", "mediapipe==0.8.10",
-        "protobuf==3.20.0", "filterpy==1.4.5", "lap==0.4.0",
-        "cython-bbox==0.1.3", "rich==12.4.4"
+        "numpy>=1.21.6", "Cython==0.29.36", "opencv-python>=4.5.5.64",
+        "onnxruntime-gpu>=1.12.0", "dearpygui>=1.6.2", "mediapipe>=0.8.10",
+        "protobuf>=3.20.0,<4", "filterpy>=1.4.5"
     ],
     classifiers=[
         "License :: OSI Approved :: Apache Software License",
         "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",
+        "Programming Language :: Python :: 3.12",
     ],
     project_urls={
-        "Source":
-        "https://github.com/Kazuhito00/Image-Processing-Node-Editor",
-        "Tracker":
-        "https://github.com/Kazuhito00/Image-Processing-Node-Editor/issues",
+        "Source": "https://github.com/Kazuhito00/Image-Processing-Node-Editor",
+        "Tracker": "https://github.com/Kazuhito00/Image-Processing-Node-Editor/issues",
     },
     entry_points={
         "console_scripts": [