From b079b7c0a3bac223b3028434c2596bafcf8742a4 Mon Sep 17 00:00:00 2001 From: Cameron Lamb Date: Fri, 22 Mar 2024 15:19:05 +0000 Subject: [PATCH] More main dep removals/unlocks empty --- poetry.lock | 63 +----------------------------------------------- pyproject.toml | 22 +++-------------- requirements.txt | 7 +----- 3 files changed, 5 insertions(+), 87 deletions(-) diff --git a/poetry.lock b/poetry.lock index 4c8c6f0c..be79854a 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1567,30 +1567,6 @@ files = [ {file = "psycopg2-2.8.6.tar.gz", hash = "sha256:fb23f6c71107c37fd667cb4ea363ddeb936b348bbd6449278eb92c189699f543"}, ] -[[package]] -name = "ptyprocess" -version = "0.5.2" -description = "Run a subprocess in a pseudo terminal" -optional = false -python-versions = "*" -files = [ - {file = "ptyprocess-0.5.2-py2.py3-none-any.whl", hash = "sha256:e8c43b5eee76b2083a9badde89fd1bbce6c8942d1045146e100b7b5e014f4f1a"}, - {file = "ptyprocess-0.5.2.tar.gz", hash = "sha256:e64193f0047ad603b71f202332ab5527c5e52aa7c8b609704fc28c0dc20c4365"}, -] - -[[package]] -name = "public" -version = "1.0.3" -description = "@public decorator, public(*objects) function - add objects names to __all__" -optional = false -python-versions = "*" -files = [ - {file = "public-1.0.3.tar.gz", hash = "sha256:b923b41a57ef886f4d0aee932aac848506680f3d746326149079f73a6403485f"}, -] - -[package.dependencies] -setuptools = "*" - [[package]] name = "pycodestyle" version = "2.6.0" @@ -1624,17 +1600,6 @@ files = [ {file = "pyflakes-2.2.0.tar.gz", hash = "sha256:35b2d75ee967ea93b55750aa9edbbf72813e06a66ba54438df2cfac9e3c27fc8"}, ] -[[package]] -name = "pyparsing" -version = "2.2.0" -description = "Python parsing module" -optional = false -python-versions = "*" -files = [ - {file = "pyparsing-2.2.0-py2.py3-none-any.whl", hash = "sha256:fee43f17a9c4087e7ed1605bd6df994c6173c1e977d7ade7b651292fab2bd010"}, - {file = "pyparsing-2.2.0.tar.gz", hash = "sha256:0832bcf47acd283788593e7a0f542407bd9550a55a8a8435214a1960e04bcb04"}, -] - [[package]] name = "pyperclip" version = "1.8.2" @@ -1749,17 +1714,6 @@ files = [ [package.dependencies] six = ">=1.5" -[[package]] -name = "pytz" -version = "2021.3" -description = "World timezone definitions, modern and historical" -optional = false -python-versions = "*" -files = [ - {file = "pytz-2021.3-py2.py3-none-any.whl", hash = "sha256:3672058bc3453457b622aab7a1c3bfd5ab0bdae451512f6cf25f64ed37f5b87c"}, - {file = "pytz-2021.3.tar.gz", hash = "sha256:acad2d8b20a1af07d4e4c9d2e9285c5ed9104354062f275f3fcd88dcef4f1326"}, -] - [[package]] name = "pyyaml" version = "6.0.1" @@ -2230,21 +2184,6 @@ files = [ {file = "xlwt-1.3.0.tar.gz", hash = "sha256:c59912717a9b28f1a3c2a98fd60741014b06b043936dcecbc113eaaada156c88"}, ] -[[package]] -name = "zipp" -version = "3.1.0" -description = "Backport of pathlib-compatible object wrapper for zip files" -optional = false -python-versions = ">=3.6" -files = [ - {file = "zipp-3.1.0-py3-none-any.whl", hash = "sha256:aa36550ff0c0b7ef7fa639055d797116ee891440eac1a56f378e2d3179e0320b"}, - {file = "zipp-3.1.0.tar.gz", hash = "sha256:c599e4d75c98f6798c509911d08a22e6c021d074469042177c8c86fb92eefd96"}, -] - -[package.extras] -docs = ["jaraco.packaging (>=3.2)", "rst.linker (>=1.9)", "sphinx"] -testing = ["func-timeout", "jaraco.itertools"] - [[package]] name = "zope-event" version = "4.4" @@ -2323,4 +2262,4 @@ testing = ["coverage (>=5.0.3)", "zope.event", "zope.testing"] [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "e95cf32fdd0d7ba4b281a69392b3150179c5a3d516781d9d97ada544d20f5012" +content-hash = "7201b789a737cf4f503b1daef38e0eb02eb21492947e53efcb695e931306049d" diff --git a/pyproject.toml b/pyproject.toml index acb5ecdd..1e2c0982 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -43,27 +43,11 @@ boto3 = "1.17.89" botocore = "1.20.89" django-storages = "1.11.1" openpyxl = "3.0.5" +requests = "^2.25.1" # Locked versions (not direct dependencies) -prompt-toolkit = "1.0.15" -ptyprocess = "0.5.2" -public = "1.0.3" -pyparsing = "2.2.0" -pytz = "2021.3" -pyyaml = "^6" -redis = "3.5.3" -requests = "^2.25.1" -s3transfer = "0.4.2" -six = "1.15.0" -sqlparse = "^0.4.4" -tablib = { version = "2.0.0", extras = ["html", "ods", "xls", "xlsx", "yaml"] } -urllib3 = "^1.26.16" -wcwidth = "0.1.7" -xlrd = "1.1.0" -xlwt = "1.3.0" -zipp = "3.1.0" -zope-event = "4.4" -zope-interface = "5.1.0" +redis = "3.5.3" # TO RECHECK +six = "1.15.0" # TO RECHECK [tool.poetry.group.prod] diff --git a/requirements.txt b/requirements.txt index 6666e8f7..ee29cca3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -57,12 +57,8 @@ openpyxl==3.0.5 ; python_version >= "3.10" and python_version < "4.0" prompt-toolkit==1.0.15 ; python_version >= "3.10" and python_version < "4.0" psycogreen==1.0.2 ; python_version >= "3.10" and python_version < "4.0" psycopg2==2.8.6 ; python_version >= "3.10" and python_version < "4.0" -ptyprocess==0.5.2 ; python_version >= "3.10" and python_version < "4.0" -public==1.0.3 ; python_version >= "3.10" and python_version < "4.0" pycparser==2.21 ; python_version >= "3.10" and platform_python_implementation == "CPython" and sys_platform == "win32" and python_version < "4.0" -pyparsing==2.2.0 ; python_version >= "3.10" and python_version < "4.0" python-dateutil==2.9.0.post0 ; python_version >= "3.10" and python_version < "4.0" -pytz==2021.3 ; python_version >= "3.10" and python_version < "4.0" pyyaml==6.0.1 ; python_version >= "3.10" and python_version < "4.0" raven==6.9.0 ; python_version >= "3.10" and python_version < "4.0" redis==3.5.3 ; python_version >= "3.10" and python_version < "4.0" @@ -76,12 +72,11 @@ sqlparse==0.4.4 ; python_version >= "3.10" and python_version < "4.0" tablib[html,ods,xls,xlsx,yaml]==2.0.0 ; python_version >= "3.10" and python_version < "4.0" typing-extensions==4.10.0 ; python_version >= "3.10" and python_version < "3.11" tzdata==2024.1 ; python_version >= "3.10" and python_version < "4.0" -urllib3==1.26.18 ; python_version >= "3.10" and python_version < "4.0" +urllib3==1.26.18 ; python_version >= "3.10" and python_version < "4" vine==5.1.0 ; python_version >= "3.10" and python_version < "4.0" wcwidth==0.1.7 ; python_version >= "3.10" and python_version < "4.0" whitenoise==6.6.0 ; python_version >= "3.10" and python_version < "4.0" xlrd==1.1.0 ; python_version >= "3.10" and python_version < "4.0" xlwt==1.3.0 ; python_version >= "3.10" and python_version < "4.0" -zipp==3.1.0 ; python_version >= "3.10" and python_version < "4.0" zope-event==4.4 ; python_version >= "3.10" and python_version < "4.0" zope-interface==5.1.0 ; python_version >= "3.10" and python_version < "4.0"