Commit Graph
1663 Commits
Author SHA1 Message Date
mvdbeek 89e06a06cc Update supervisor config when starting galaxy via run.sh 2022-04-05 11:14:11 +02:00
mvdbeek 4c7bfd1032 Fix tool shed bootstrapping script 2022-03-17 19:34:43 +01:00
mvdbeek e9d2d683d6 Add --capture-output when running gunicorn in daemon mode 2022-03-17 19:34:16 +01:00
mvdbeek 3fa572d612 First pass at supporting --preload and worker_id
We do need to include some kind of worker id in the server_name. If we
don't do this and we start with multiple workers the internal
QueueWorker won't work and multiple processes can pick up the same job
if the web process is also a job handler.
2022-03-10 17:15:37 +01:00
Nicola Soranzo e886d38171 Merge branch 'release_21.09' into release_22.01 2022-03-04 16:16:15 +00:00
mvdbeek 873d43eac2 Move tool shed and reports config schema to config package
And restore unit tests to proper place.
2022-03-03 16:57:39 +01:00
Nate Coraor 6a20106694 Fix typo with metadata_file 2022-03-02 14:23:46 -05:00
Nate Coraor a9b4b632a9 Fix pgcleanup.py for datasets stored by UUID 2022-03-02 14:18:31 -05:00
mvdbeek 034f518e43 Move init_models_from_config to galaxy.model.mapping 2022-03-01 16:50:06 +01:00
mvdbeek c08a12f553 Drop get_database_url helper
I don't see an advantage over accessing the config attribute instead.
2022-03-01 16:50:06 +01:00
mvdbeek f4183ac5a0 Drop scripts/nosetests.py 2022-02-28 15:24:07 +01:00
mvdbeek 400922a5a4 Drop pkg_resources 2022-02-28 14:07:08 +01:00
Marius van den BeekandNicola Soranzo bcbdb9184e Don't escape quotes
Co-authored-by: Nicola Soranzo <nicola.soranzo@gmail.com>
2022-02-23 15:43:32 +01:00
Marius van den BeekandNicola Soranzo b439675a38 Tweak comment
And no, we could read out the port from the uwsgi section, or decide to move it elsewhere.

Co-authored-by: Nicola Soranzo <nicola.soranzo@gmail.com>
2022-02-23 12:59:23 +01:00
mvdbeek 3800ddf6ff Move up GUNICORN_CMD_ARGS 2022-02-23 10:33:44 +01:00
mvdbeek 31dd8e4b46 Fix tool_shed entrypoint and default port 2022-02-22 17:58:28 +01:00
Nate Coraor 0297eb1bc8 Ensure $GRAVITY_STATE_DIR is present in venv activate script any time
run.sh/common_startup.sh is called normally (without --skip-venv or
--no-create-venv).
2022-02-16 10:09:50 -05:00
Nicola Soranzo a8f5965ba6 Fix gravity requirement for Poetry
For VCS references, need to specify the branch if it's not `master`.

Also:
- Update Poetry download link
- Require pip >= 19.3 to support direct references as requirement
  specifiers
  https://www.python.org/dev/peps/pep-0440/#direct-references
2022-01-31 15:09:35 +00:00
Nate Coraor 6c9d497e82 Only set $GALAXY_DAEMON_LOG when using gravity since other servers have
their own means of setting a log file. Read the supervisor log if it
exists and the daemon log does not, since failure to start Galaxy will
prevent creation of the daemon log file.

When running first startup in CI, attempt to read log files from
multiple places to make debugging different types of failures possible.
2022-01-26 14:50:39 -05:00
Nate Coraor 1d21506f78 Set $GALAXY_DAEMON_LOG when running run.sh --daemon for compatibility. 2022-01-24 15:45:11 -05:00
Nate Coraor 096c75a1fb No magic arg getter for gunicorn means we have to explicitly pass the
sample config if necessary
2022-01-24 14:00:56 -05:00
Nate Coraor 98e1cd0c29 Set gunicorn worker for non-galaxy webapps 2022-01-24 10:20:59 -05:00
Nate Coraor b3bd38be4a Attempt to properly start reports 2022-01-21 15:45:10 -05:00
Nate Coraor 141e9008f4 Not all echos interpret backslash chars (and -e is not standard either) 2022-01-21 14:07:26 -05:00
Nate Coraor 080b92ad25 Add daemon mode options for Gravity 2022-01-21 13:51:53 -05:00
Nate Coraor c9cf15576c Move gunicorn to regular requirements (not just dev) and add uvloop.
Swap circusd for gravity to start dev-mode/run.sh Galaxy.
2022-01-21 13:29:14 -05:00
Nate Coraor a53ef1888d If creating venv, modify activate to set $GRAVITY_STATE_DIR so that
gravity can be used anywhere once the venv is activated.
2022-01-21 09:51:34 -05:00
mvdbeek 4484f0d2f3 Adjust release-diff.py
For the 22.01 release I will just create symlinks to the old locations.
2022-01-19 18:20:19 +00:00
Nicola Soranzo 72874b74a5 Add tox environment and GitHub workflow for reports startup test
Also:
- Fix tox envlist still using py36
- Partially fix running reports with `APP_WEBSERVER=dev`
2021-12-18 15:56:46 +00:00
mvdbeek bab12662a9 Drop old sqlalchemy patterns 2021-12-16 12:30:49 +01:00
Nicola Soranzo 8c7477cab6 Test Galaxy release script
xref. https://github.com/galaxyproject/galaxy/pull/11641#discussion_r764049621
2021-12-08 10:43:09 +00:00
Nicola Soranzo 0bdc93a7cc Drop support for Python 3.6, add Python 3.10 2021-12-08 08:14:10 +00:00
Nicola Soranzo 8b07805228 Merge branch 'release_21.09' into dev 2021-12-03 12:58:27 +00:00
Nicola Soranzo b779aeb21a Merge branch 'release_21.05' into release_21.09 2021-12-03 12:56:28 +00:00
Nicola Soranzo 262ab8386c Increase pip minimum version in startup script
Pip <19.0 cannot install abi3 wheels, so for example on Python >3.6 it
would (try to) build a cryptography wheel, which is not needed since
cp36-abi3 wheels are already available on PyPI:
https://cryptography.io/en/latest/faq/#why-are-there-no-wheels-for-my-python3-x-version

Fix https://github.com/galaxyproject/galaxy/issues/13023 .

xref: https://github.com/galaxyproject/planemo/issues/1208#issuecomment-984831111
2021-12-03 11:02:20 +00:00
Nicola Soranzo bd0cefa020 Don't use triple-quoted strings as comments
They are expressions that get uselessly evaluated.

These were reported as B018 errors by flake8-bugbear 21.11.28 , but B018 for
strings has then been disabled in 21.11.29 since these strings can also be
used as inline attribute doc strings or module variable docstrings (not our
case though).
2021-11-29 23:02:34 +00:00
Nicola Soranzo 1701d0ed67 Merge pull request #13002 from nsoranzo/unnecessary_lists 2021-11-29 18:35:38 +00:00
John Chilton 965f579c39 Merge pull request #13000 from mvdbeek/separate_celery_tasks
Move ``galaxy_tasks`` decorator to ``galaxy.celery``
2021-11-29 11:41:55 -05:00
Nicola Soranzo 7b67cea7d0 Remove unnecessary list creations 2021-11-29 16:33:05 +00:00
mvdbeek 0091d37469 Add interactive shell for celery tasks
That's pretty useful for developing new tasks or just running one-off
tasks.
2021-11-29 10:34:01 +01:00
mvdbeek 6036a234c1 Move galaxy_tasks decorator to galaxy.celery
That means we can import additional tasks that use `galaxy_task` in
galaxy.celery.tasks without circular imports.
2021-11-29 10:34:01 +01:00
Nicola Soranzo 38c0a5aa50 Remove tests that are now passing from RED_TESTS 2021-11-26 18:21:58 +00:00
Nicola Soranzo eeb8a4e6bd Fix path handling in imported conformance tests 2021-11-25 13:37:44 +00:00
John Chilton 9a586a58b9 Add CWL conformance API tests
1) Download conformance tests to `test/functional/tools/cwl_tools` where
  they can be used also by framework and unit tests in the future.
2) Add populators to enable executing CWL conformance tests
3) Generate CWL conformance API tests only when needed for tests
2021-11-23 14:10:21 +00:00
mvdbeek bc329c7b84 Merge branch 'release_21.09' into dev 2021-11-02 11:54:42 +01:00
mvdbeek c657675d07 Adjust check_blocking_issues to PyGithub usage 2021-11-01 13:01:02 +01:00
mvdbeek c378d08f19 Add release-diff.py to process 2021-11-01 12:37:53 +01:00
mvdbeek a9058c54ba Produce Literal Blocks for config value changes
These scroll correctly and don't fail when config description changes
includes newlines or long text.
2021-11-01 12:37:53 +01:00
mvdbeek 3b0c86f563 Fix and update bootstrap_history 2021-10-31 16:24:38 +01:00
Nicola Soranzo 90a729e431 New pyupgrade fixes
Found by running `ack --type=python -f | grep -v '^tools/' | xargs pyupgrade --py36-plus`
2021-10-24 12:10:34 +01:00