Nicola Soranzo
0a73e1c512
Merge branch 'release_23.0' into release_23.1
2023-07-24 15:16:11 +01:00
Nicola Soranzo
c7db0bbeca
Do not install npm/yarn via conda if they already available at the correct version
2023-07-21 00:58:36 +01:00
Nicola Soranzo
a9b2a4f7b0
Code refactoring
...
Simplification allowed by commit 39c0000c1b
2023-07-21 00:58:36 +01:00
Matthias Bernt
1b2ac2a212
also set galaxy config file variable in common startup
...
otherwise GALAXY_CONDITIONAL_DEPENDENCIES can not be determined.
in run.sh set_galaxy_config_file_var is called only after common_startup
is called.
2023-07-21 00:58:35 +01:00
Matthias Bernt
bb90e3b5dc
activate the conda env before the python venv
...
and install node and yarn via conda if a conda env is used
2023-07-21 00:58:35 +01:00
Nicola Soranzo
387aa1dd48
Test first startup on macOS also with Python 3.11
...
- Allow passing GALAXY_CONDA_PYTHON_VERSION environment variable to
the startup script to specify the Python version to use when
creating the `_galaxy_` conda environment.
- Some Shellcheck fixes.
2023-07-21 00:58:33 +01:00
Matthias Bernt
92806a97a5
Improve log message wording
2023-07-20 18:32:00 +01:00
Nicola Soranzo
36ed2d5ae2
Merge branch 'release_23.0' into release_23.1
2023-07-13 10:25:48 +01:00
Nicola Soranzo
62497462e0
Don't always install node in the virtualenv
...
if it's already installed system-wide at the correct version.
Prevent node installation issues during CI builds where we install
node with the setup-node action but it was ignored because it was
not inside the virtualenv, e.g.:
https://github.com/galaxyproject/galaxy/actions/runs/5530959878/jobs/10091018774
2023-07-12 19:26:02 +01:00
mvdbeek
bb969c7505
Replace bootstrap_history.py with galaxy-release-util
2023-06-13 20:42:35 +02:00
mvdbeek
67c7181a6a
Merge branch 'release_23.0' into dev
2023-06-13 17:30:22 +02:00
mvdbeek
787b8040c8
Use galaxy-release-util to upload python packages
2023-06-13 15:49:37 +02:00
mvdbeek
aca993125b
Merge branch 'release_23.0' into dev
2023-06-13 15:35:05 +02:00
mvdbeek
48573d3a1f
Fix next version number
2023-06-10 11:22:42 +02:00
John Davis
fe3c2e2711
Wrap session.flush in pages_identifier_conversion scripts
2023-06-09 13:05:26 -04:00
John Davis
2ed822afd0
Wrap session.flush in set_dataset_sizes script
2023-06-09 13:05:26 -04:00
John Davis
9ddaaf8d06
Wrap session.flush in tool_shed/* scripts
2023-06-09 13:05:26 -04:00
John Davis
07867fa8c7
Wrap session.flush in update_shed_config_path script
2023-06-09 13:05:26 -04:00
John Davis
0c895d1409
Wrap session.flush in admin_cleanup_datasets script
2023-06-09 13:05:26 -04:00
John Davis
e7408dcd98
Wrap session.flush in populate_uuid script
2023-06-09 13:05:26 -04:00
John Davis
96e534122d
Wrap session.flush in cleanup_datasets script
2023-06-09 13:05:26 -04:00
mvdbeek
01a1755027
Merge branch 'release_23.0' into dev
2023-06-08 18:36:41 +02:00
mvdbeek
06c8fc073d
Add --skip-existing flag to twine upload
2023-06-08 16:53:38 +02:00
mvdbeek
e2169c6597
Drop workaround for old docutils
2023-06-06 17:26:27 +02:00
mvdbeek
368dfb3119
Merge branch 'release_23.0' into dev
2023-06-06 15:55:12 +02:00
Marius van den Beek
5c2460608b
Merge pull request #16195 from mvdbeek/quit_if_branches_not_updated
...
[23.0] Assert that local branches are up to date in release point script
2023-06-06 15:53:54 +02:00
mvdbeek
7056942682
Fail if local branch doesn't match remote branch
2023-06-06 15:04:43 +02:00
mvdbeek
e2e7cbc3f4
Make point release script compatible with docutils 0.16
2023-06-05 16:02:17 +02:00
mvdbeek
73413b1627
Merge branch 'release_23.0' into dev
2023-06-01 15:19:47 +02:00
John Chilton
2103eb0b8e
Converge release process auth discovery.
2023-05-30 13:11:27 -04:00
Nicola Soranzo
afc11e2ebc
Merge branch 'release_23.0' into dev
2023-05-30 17:49:58 +01:00
mvdbeek
a4f43ca6f9
Drop package_repository argument, just use TWINE_REPOSITORY_URL
2023-05-28 11:15:59 +02:00
mvdbeek
c4548d0a84
--no-build-packages
2023-05-28 11:15:59 +02:00
mvdbeek
521d144ebd
Fix twine upload command
2023-05-28 11:15:59 +02:00
mvdbeek
ebf5b73594
Set default galaxy-root option to CWD
2023-05-28 11:15:59 +02:00
mvdbeek
cc7e90211b
Fix no_confirm logic
2023-05-28 11:15:59 +02:00
mvdbeek
f1d0be7ef9
Fail on build errors
2023-05-28 11:15:59 +02:00
mvdbeek
4464ef9248
Implement pushing to upstream git url
2023-05-28 11:15:58 +02:00
mvdbeek
20a28bf2d8
Split functionality into subcommands
2023-05-28 11:15:58 +02:00
mvdbeek
93dae39806
Ensure that merges will not conflict
2023-05-28 11:15:58 +02:00
mvdbeek
d8e62f8f5a
Add script for creating (point) releases
...
Still working on it, but it's minimally useful already.
2023-05-28 11:15:57 +02:00
Nicola Soranzo
940ff9fe36
Test first startup on macOS also with Python 3.11
...
- Allow passing GALAXY_CONDA_PYTHON_VERSION environment variable to
the startup script to specify the Python version to use when
creating the `_galaxy_` conda environment.
- Some Shellcheck fixes.
2023-05-12 15:45:39 +01:00
John Davis
84743c4786
Add --repair argument to upgrade/downgrade commands on db_dev script
2023-04-26 08:53:35 -04:00
Nicola Soranzo
64af46c4ae
Fix new B018 errors raised by ruff 0.0.260
2023-04-13 16:53:01 +01:00
Dannon Baker
af8154126e
Merge branch 'release_23.0' into 'release_23.1'
2023-04-11 09:10:43 -04:00
Dannon Baker
f94e5521ba
Fix release script to be compatible with YY.X dates
...
TODO: make this flexible enough to handle 24.X, but we need to
discuss the rest of the process
2023-04-10 16:51:05 -04:00
Nicola Soranzo
c655360e4e
Merge branch 'release_23.0' into dev
2023-04-05 12:39:43 +01:00
Nicola Soranzo
bee3d2e7ac
Merge branch 'release_22.05' into release_23.0
2023-04-03 16:31:48 +01:00
Nicola Soranzo
c3139f246d
Fix UP031 errors reported by ruff
2023-03-29 08:55:54 +01:00
Dannon Baker
9b1301e6ae
Apply black to forward merge
2023-03-27 10:51:25 -04:00
Nicola Soranzo