Unverified Commit 2ca67848 authored by Nate Coraor's avatar Nate Coraor
Browse files

Merge remote-tracking branch 'upstream/release_23.0' into release_23.1

parents 4d4f87b7 34e75800

packages/app/setup.cfg

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ install_requires = 
    paramiko!=2.9.0,!=2.9.1

    pebble

    pulsar-galaxy-lib>=0.15.0.dev0

    pydantic

    pydantic<2

    pysam>=0.20

    PyJWT

    PyYAML

packages/data/setup.cfg

+2 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ install_requires = 
    numpy

    parsley

    pycryptodome

    pydantic[email]

    pydantic[email]<2

    pylibmagic

    python-magic

    pysam>=0.20

packages/tool_util/setup.cfg

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ install_requires = 
    lxml

    MarkupSafe

    packaging

    pydantic

    pydantic<2

    PyYAML

    requests

    sortedcontainers

packages/tours/setup.cfg

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ version = 23.1.dev0 
include_package_data = True

install_requires =

    galaxy-navigation

    pydantic

    pydantic<2

    PyYAML

packages = find:

python_requires = >=3.7

packages/web_apps/setup.cfg

+3 −3
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ install_requires = 
    apispec

    Babel

    Cheetah3

    fastapi>=0.68.2,!=0.69.0,!=0.70.0,!=0.70.1

    fastapi>=0.68.2,!=0.69.0,!=0.70.0,!=0.70.1,<0.99

    fastapi-utils

    gunicorn

    gxformat2
@@ -51,7 +51,7 @@ install_requires = 
    MarkupSafe

    mercurial

    Paste

    pydantic

    pydantic<2

    PyJWT

    python-dateutil

    python-multipart  # required to support form parsing in FastAPI/Starlette