From 30a015d80f4c9ef9e75688b794844930df638361 Mon Sep 17 00:00:00 2001 From: 00magikarp <94652654+00magikarp@users.noreply.github.com> Date: Thu, 18 Jul 2024 16:01:10 -0400 Subject: [PATCH 1/3] remove repeated packages, update attrs package to work with other packages --- falconscoutcore/requirements.txt | 141 +------------------------------ 1 file changed, 2 insertions(+), 139 deletions(-) diff --git a/falconscoutcore/requirements.txt b/falconscoutcore/requirements.txt index d66d273..800e63b 100644 --- a/falconscoutcore/requirements.txt +++ b/falconscoutcore/requirements.txt @@ -6,93 +6,25 @@ MarkupSafe==2.1.1 Werkzeug==2.2.2 certifi==2022.12.7 charset-normalizer==2.1.1 -click==8.1.3 -Flask==2.2.2 idna==3.4 -itsdangerous==2.1.2 -Jinja2==3.1.2 -MarkupSafe==2.1.1 -requests==2.28.1 -urllib3==1.26.13 -Werkzeug==2.2.2 -certifi==2022.12.7 -charset-normalizer==2.1.1 -click==8.1.3 -Flask==2.2.2 -idna==3.4 -itsdangerous==2.1.2 -Jinja2==3.1.2 -MarkupSafe==2.1.1 -python-dotenv==0.21.0 requests==2.28.1 urllib3==1.26.13 -Werkzeug==2.2.2 -certifi==2022.12.7 -cffi==1.15.1 -charset-normalizer==2.1.1 -click==8.1.3 -Deprecated==1.2.13 -Flask==2.2.2 -idna==3.4 -itsdangerous==2.1.2 -Jinja2==3.1.2 -MarkupSafe==2.1.1 -pycparser==2.21 -PyGithub==1.57 -PyJWT==2.6.0 -PyNaCl==1.5.0 python-dotenv==0.21.0 -requests==2.28.1 -urllib3==1.26.13 -Werkzeug==2.2.2 -wrapt==1.14.1 -certifi==2022.12.7 cffi==1.15.1 -charset-normalizer==2.1.1 -click==8.1.3 Deprecated==1.2.13 -Flask==2.2.2 -idna==3.4 -itsdangerous==2.1.2 -Jinja2==3.1.2 -MarkupSafe==2.1.1 pycparser==2.21 PyGithub==1.57 PyJWT==2.6.0 PyNaCl==1.5.0 -python-dotenv==0.21.0 -requests==2.28.1 -urllib3==1.26.13 -Werkzeug==2.2.2 wrapt==1.14.1 -certifi==2022.12.7 -cffi==1.15.1 -charset-normalizer==2.1.1 -click==8.1.3 -Deprecated==1.2.13 -Flask==2.2.2 -idna==3.4 -itsdangerous==2.1.2 -Jinja2==3.1.2 -MarkupSafe==2.1.1 -pycparser==2.21 -PyGithub==1.57 -PyJWT==2.6.0 -PyNaCl==1.5.0 -python-dotenv==0.21.0 PyYAML==6.0 -requests==2.28.1 -urllib3==1.26.13 -Werkzeug==2.2.2 -wrapt==1.14.1 aiohttp==3.8.3 aiohttp-client-cache==0.7.3 aiosignal==1.2.0 async-timeout==4.0.2 -attrs==22.1.0 +attrs==22.2.0 autopep8==1.7.0 cfgv==3.3.1 -charset-normalizer==2.1.1 contourpy==1.0.6 coverage==6.4.4 cycler==0.11.0 @@ -103,9 +35,7 @@ flake8==5.0.4 fonttools==4.38.0 frozenlist==1.3.1 identify==2.5.5 -idna==3.4 iniconfig==1.1.1 -itsdangerous==2.1.2 kiwisolver==1.4.4 matplotlib==3.6.2 mccabe==0.7.0 @@ -124,79 +54,12 @@ pyflakes==2.5.0 pyparsing==3.0.9 pytest==7.1.2 python-dateutil==2.8.2 -python-dotenv==0.21.0 python-forge==18.6.0 pytz==2022.6 -PyYAML==6.0 scipy==1.9.3 six==1.16.0 toml==0.10.2 tomli==2.0.1 url-normalize==1.4.3 virtualenv==20.16.5 -yarl==1.8.1 -aiohttp==3.8.3 -aiohttp-client-cache==0.7.3 -aiosignal==1.2.0 -async-timeout==4.0.2 -attrs==22.1.0 -autopep8==1.7.0 -certifi==2022.12.7 -cffi==1.15.1 -cfgv==3.3.1 -charset-normalizer==2.1.1 -click==8.1.3 -contourpy==1.0.6 -coverage==6.4.4 -cycler==0.11.0 -Deprecated==1.2.13 -distlib==0.3.6 -falcon-alliance==0.4.4 -filelock==3.8.0 -flake8==5.0.4 -Flask==2.2.2 -fonttools==4.38.0 -frozenlist==1.3.1 -identify==2.5.5 -idna==3.4 -iniconfig==1.1.1 -itsdangerous==2.1.2 -Jinja2==3.1.2 -kiwisolver==1.4.4 -MarkupSafe==2.1.1 -matplotlib==3.6.2 -mccabe==0.7.0 -multidict==6.0.2 -nodeenv==1.7.0 -numpy==1.23.4 -packaging==21.3 -pandas==1.5.1 -Pillow==9.3.0 -platformdirs==2.5.2 -pluggy==1.0.0 -pre-commit==2.20.0 -py==1.11.0 -pycodestyle==2.9.1 -pycparser==2.21 -pyflakes==2.5.0 -PyGithub==1.57 -PyJWT==2.6.0 -PyNaCl==1.5.0 -pyparsing==3.0.9 -pytest==7.1.2 -python-dateutil==2.8.2 -python-dotenv==0.21.0 -python-forge==18.6.0 -pytz==2022.6 -PyYAML==6.0 -requests==2.28.1 -scipy==1.9.3 -six==1.16.0 -toml==0.10.2 -tomli==2.0.1 -url-normalize==1.4.3 -urllib3==1.26.13 -virtualenv==20.16.5 -Werkzeug==2.2.2 -wrapt==1.14.1 -yarl==1.8.1 +yarl==1.8.1 \ No newline at end of file From 62cc8899bc3d81bad69bdb2b45aa6f3782b19f35 Mon Sep 17 00:00:00 2001 From: 00magikarp <94652654+00magikarp@users.noreply.github.com> Date: Thu, 18 Jul 2024 16:52:27 -0400 Subject: [PATCH 2/3] add cv2 pyzbar streamlit --- falconscoutcore/requirements.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/falconscoutcore/requirements.txt b/falconscoutcore/requirements.txt index 800e63b..437e3bd 100644 --- a/falconscoutcore/requirements.txt +++ b/falconscoutcore/requirements.txt @@ -42,6 +42,7 @@ mccabe==0.7.0 multidict==6.0.2 nodeenv==1.7.0 numpy==1.23.4 +opencv-python==4.10.0.84 packaging==21.3 pandas==1.5.1 Pillow==9.3.0 @@ -56,8 +57,10 @@ pytest==7.1.2 python-dateutil==2.8.2 python-forge==18.6.0 pytz==2022.6 +pyzbar==0.1.9 scipy==1.9.3 six==1.16.0 +streamlit==1.36.0 toml==0.10.2 tomli==2.0.1 url-normalize==1.4.3 From a3662c4aba68d0c15e55c2ecdb52a693feb9354e Mon Sep 17 00:00:00 2001 From: 00magikarp <94652654+00magikarp@users.noreply.github.com> Date: Thu, 18 Jul 2024 17:08:20 -0400 Subject: [PATCH 3/3] alphabetic sort looks nice --- falconscoutcore/requirements.txt | 42 ++++++++++++++++---------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/falconscoutcore/requirements.txt b/falconscoutcore/requirements.txt index 437e3bd..96449d2 100644 --- a/falconscoutcore/requirements.txt +++ b/falconscoutcore/requirements.txt @@ -1,42 +1,32 @@ -click==8.1.3 -Flask==2.2.2 -itsdangerous==2.1.2 -Jinja2==3.1.2 -MarkupSafe==2.1.1 -Werkzeug==2.2.2 -certifi==2022.12.7 -charset-normalizer==2.1.1 -idna==3.4 -requests==2.28.1 -urllib3==1.26.13 -python-dotenv==0.21.0 -cffi==1.15.1 -Deprecated==1.2.13 -pycparser==2.21 -PyGithub==1.57 -PyJWT==2.6.0 -PyNaCl==1.5.0 -wrapt==1.14.1 -PyYAML==6.0 -aiohttp==3.8.3 aiohttp-client-cache==0.7.3 +aiohttp==3.8.3 aiosignal==1.2.0 async-timeout==4.0.2 attrs==22.2.0 autopep8==1.7.0 +certifi==2022.12.7 +cffi==1.15.1 cfgv==3.3.1 +charset-normalizer==2.1.1 +click==8.1.3 contourpy==1.0.6 coverage==6.4.4 cycler==0.11.0 +Deprecated==1.2.13 distlib==0.3.6 falcon-alliance==0.4.4 filelock==3.8.0 flake8==5.0.4 +Flask==2.2.2 fonttools==4.38.0 frozenlist==1.3.1 identify==2.5.5 +idna==3.4 iniconfig==1.1.1 +itsdangerous==2.1.2 +Jinja2==3.1.2 kiwisolver==1.4.4 +MarkupSafe==2.1.1 matplotlib==3.6.2 mccabe==0.7.0 multidict==6.0.2 @@ -51,18 +41,28 @@ pluggy==1.0.0 pre-commit==2.20.0 py==1.11.0 pycodestyle==2.9.1 +pycparser==2.21 pyflakes==2.5.0 +PyGithub==1.57 +PyJWT==2.6.0 +PyNaCl==1.5.0 pyparsing==3.0.9 pytest==7.1.2 python-dateutil==2.8.2 +python-dotenv==0.21.0 python-forge==18.6.0 pytz==2022.6 +PyYAML==6.0 pyzbar==0.1.9 +requests==2.28.1 scipy==1.9.3 six==1.16.0 streamlit==1.36.0 toml==0.10.2 tomli==2.0.1 url-normalize==1.4.3 +urllib3==1.26.13 virtualenv==20.16.5 +Werkzeug==2.2.2 +wrapt==1.14.1 yarl==1.8.1 \ No newline at end of file