From 480b62f372117eece3c4c87bf555bd02be095a23 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Wed, 2 Feb 2022 22:00:15 -0500 Subject: [PATCH] Add isort devdependency --- lib/galaxy/dependencies/dev-requirements.txt | 9 +++++---- lib/galaxy/dependencies/pinned-requirements.txt | 3 ++- pyproject.toml | 1 + 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/galaxy/dependencies/dev-requirements.txt b/lib/galaxy/dependencies/dev-requirements.txt index 9e02e9b9843..80742143f6f 100644 --- a/lib/galaxy/dependencies/dev-requirements.txt +++ b/lib/galaxy/dependencies/dev-requirements.txt @@ -30,7 +30,7 @@ cached-property==1.5.2; python_version < "3.8" and python_version >= "3.7" celery==5.2.3; python_version >= "3.7" certifi==2021.10.8; python_version >= "3.7" and python_full_version < "3.0.0" and python_version < "4" or python_full_version >= "3.6.0" and python_version < "4" and python_version >= "3.7" cffi==1.15.0 -charset-normalizer==2.0.11; python_full_version >= "3.6.0" and python_version >= "3.6" and python_version < "4" +charset-normalizer==2.0.11; python_full_version >= "3.6.0" and python_version >= "3.7" and python_version < "4" cheetah3==3.2.6.post1; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.4.0") circus==0.17.1 click-didyoumean==0.3.0; python_full_version >= "3.6.2" and python_full_version < "4.0.0" and python_version >= "3.7" @@ -80,6 +80,7 @@ importlib-resources==5.4.0; python_version >= "3.6" iniconfig==1.1.1; python_version >= "3.7" isa-rwval==0.10.10 isodate==0.6.1; python_version >= "3.7" and python_version < "4" +isort==5.10.1; python_full_version >= "3.6.1" and python_version < "4.0" jinja2==3.0.3; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6" jsonschema==4.4.0; python_version >= "3.7" junit-xml==1.9; python_version >= "3.6" and python_version < "4" @@ -91,7 +92,7 @@ mako==1.1.6; (python_version >= "2.7" and python_full_version < "3.0.0") or (pyt markdown-it-reporter==0.0.2 markdown==3.3.6; python_version >= "3.6" markupsafe==2.0.1; python_version >= "3.6" -mercurial==6.0.1 +mercurial==6.0.2 mirakuru==2.4.1; python_version >= "3.7" mistune==0.8.4; python_version >= "3.7" and python_version < "4" mrcfile==1.3.0 @@ -166,7 +167,7 @@ repoze.lru==0.7 requests-oauthlib==1.3.1; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" requests-toolbelt==0.9.1; python_version >= "3.6" requests==2.27.1; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.6.0") -responses==0.17.0; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0") +responses==0.18.0; python_version >= "3.7" rfc3986==1.5.0; python_version >= "3.6" rich==11.1.0; python_full_version >= "3.6.2" and python_full_version < "4.0.0" routes==2.5.1 @@ -177,7 +178,7 @@ schema-salad==8.2.20220103095339; python_version >= "3.7" and python_version < " selenium==4.1.0; python_version >= "3.7" and python_version < "4.0" setuptools-scm==5.0.2; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version < "4" shellescape==3.8.1; python_version >= "3.6" and python_version < "4" -six==1.16.0; python_version >= "3.7" and python_full_version < "3.0.0" and python_version < "4" or python_full_version >= "3.5.0" and python_version >= "3.7" and python_version < "4" +six==1.16.0; python_version >= "3.7" and python_full_version < "3.0.0" and python_version < "4" or python_full_version >= "3.3.0" and python_version >= "3.7" and python_version < "4" sniffio==1.2.0; python_version >= "3.7" and python_full_version >= "3.6.2" and python_version < "4.0" snowballstemmer==2.2.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6" social-auth-core==4.0.3 diff --git a/lib/galaxy/dependencies/pinned-requirements.txt b/lib/galaxy/dependencies/pinned-requirements.txt index c5fd30801a5..4a98d727db5 100644 --- a/lib/galaxy/dependencies/pinned-requirements.txt +++ b/lib/galaxy/dependencies/pinned-requirements.txt @@ -67,6 +67,7 @@ importlib-metadata==4.10.1; python_version == "3.7" and (python_version >= "3.7" importlib-resources==5.4.0; python_version >= "3.6" isa-rwval==0.10.10 isodate==0.6.1; python_version >= "3.7" and python_version < "4" +isort==5.10.1; python_full_version >= "3.6.1" and python_version < "4.0" jsonschema==4.4.0; python_version >= "3.7" kombu==5.2.3; python_version >= "3.7" lagom==1.7.0; python_version >= "3.6" and python_version < "4.0" @@ -75,7 +76,7 @@ lxml==4.7.1; (python_version >= "2.7" and python_full_version < "3.0.0") or (pyt mako==1.1.6; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.4.0") markdown==3.3.6; python_version >= "3.6" markupsafe==2.0.1; python_version >= "3.6" -mercurial==6.0.1 +mercurial==6.0.2 mistune==0.8.4; python_version >= "3.7" and python_version < "4" mrcfile==1.3.0 msgpack==1.0.3; python_version >= "3.7" and python_version < "4" diff --git a/pyproject.toml b/pyproject.toml index 0a19ddcc294..f15c7bf6c54 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -100,6 +100,7 @@ uvloop = "*" WebOb = "*" Whoosh = "*" zipstream-new = "*" +isort = "^5.10.1" [tool.poetry.dev-dependencies] black = "^22.1.0"