From 8dce7c6a5dda73444bca58f99b205341c25a870c Mon Sep 17 00:00:00 2001 From: Janet Gainer-Dewar Date: Mon, 29 Apr 2024 13:30:10 -0400 Subject: [PATCH 1/3] Upgrade gunicorn --- servers/cromwell/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers/cromwell/requirements.txt b/servers/cromwell/requirements.txt index 05030d67..08f6f6ff 100644 --- a/servers/cromwell/requirements.txt +++ b/servers/cromwell/requirements.txt @@ -6,7 +6,7 @@ connexion==2.14.1 Flask==2.2.5 gevent==23.9 greenlet==2.0.2 -gunicorn==20.1.0 +gunicorn==22.0.0 idna==2.7 inflection==0.3.1 itsdangerous==2.1.2 From 59f416d5727f254a74b0d3e4601916a622cb8c5f Mon Sep 17 00:00:00 2001 From: Janet Gainer-Dewar Date: Mon, 29 Apr 2024 13:50:24 -0400 Subject: [PATCH 2/3] Give up on standard requirements handling --- servers/cromwell/README.md | 18 ------------------ servers/cromwell/requirements-to-freeze.txt | 7 ------- servers/jm_utils/README.md | 15 --------------- servers/jm_utils/requirements-to-freeze.txt | 1 - 4 files changed, 41 deletions(-) delete mode 100644 servers/cromwell/requirements-to-freeze.txt delete mode 100644 servers/jm_utils/requirements-to-freeze.txt diff --git a/servers/cromwell/README.md b/servers/cromwell/README.md index 5e2fd5cb..59589c49 100644 --- a/servers/cromwell/README.md +++ b/servers/cromwell/README.md @@ -371,21 +371,3 @@ To run unit and integration tests on the python-flask app, install cd servers/cromwell tox -- -s ``` - -## Generating `requirements.txt` - -`requirements.txt` is autogenerated from `requirements-to-freeze.txt`. The -latter lists only direct dependencies. To regenerate run: -``` -virtualenv --python=/usr/bin/python2 /tmp/cromwell-server-requirements -source /tmp/cromwell-server-requirements/bin/activate -``` -Then, from the cromwell directory in this repo: -``` -pip install -r requirements-to-freeze.txt -pip freeze | sort -f | sed 's/^jm-utils.*/\.\.\/jm_utils/g' > requirements.txt -deactivate -``` - -The sed command above replaces jm-utils=x.y.z with ../jm_utils, which is required -to allow pip to install from the local jm_utils directory. diff --git a/servers/cromwell/requirements-to-freeze.txt b/servers/cromwell/requirements-to-freeze.txt deleted file mode 100644 index e4661503..00000000 --- a/servers/cromwell/requirements-to-freeze.txt +++ /dev/null @@ -1,7 +0,0 @@ -connexion == 1.1.13 -python_dateutil == 2.6.0 -typing == 3.5.2.2 -setuptools >= 65.4.1 -gevent==23.9 -gunicorn==19.8.1 -../jm_utils diff --git a/servers/jm_utils/README.md b/servers/jm_utils/README.md index 2eea58a1..7d802336 100644 --- a/servers/jm_utils/README.md +++ b/servers/jm_utils/README.md @@ -35,18 +35,3 @@ To run unit tests, install cd servers/jm_utils tox -- -s ``` - -## Generating `requirements.txt` - -`requirements.txt` is autogenerated from `requirements-to-freeze.txt`. The -latter lists only direct dependencies. To regenerate, run: -``` -virtualenv --python=/usr/bin/python2 /tmp/jm-utils-requirements -source /tmp/jm-utils-requirements/bin/activate -pip install -r servers/jm_utils/requirements-to-freeze.txt -pip freeze > servers/jm_utils/requirements.txt -deactivate -``` - -Any library dependencies also need to be added to the `REQUIRES` list in -`setup.py` diff --git a/servers/jm_utils/requirements-to-freeze.txt b/servers/jm_utils/requirements-to-freeze.txt deleted file mode 100644 index af44f198..00000000 --- a/servers/jm_utils/requirements-to-freeze.txt +++ /dev/null @@ -1 +0,0 @@ -pytz From 3b6167a0e00dc0d33de21bda6926646c987d1d41 Mon Sep 17 00:00:00 2001 From: Janet Gainer-Dewar Date: Mon, 29 Apr 2024 13:51:18 -0400 Subject: [PATCH 3/3] Adjust for multiple IP addresses --- TERRA_QUICKSTART.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TERRA_QUICKSTART.md b/TERRA_QUICKSTART.md index 005b080b..48925178 100644 --- a/TERRA_QUICKSTART.md +++ b/TERRA_QUICKSTART.md @@ -32,7 +32,7 @@ $ export CROMWELL_URL="http://192.XXX.Y.ZZZ:8000/api/workflows/v1" ``` or the one-liner: ``` -$ export CROMWELL_URL="http://$(ifconfig | grep inet | grep broadcast | cut -d ' ' -f 2):8000/api/workflows/v1" +$ export CROMWELL_URL="http://$(ifconfig | grep inet | grep broadcast | head -n 1 | cut -d ' ' -f 2):8000/api/workflows/v1" ``` ### Start JobManager