From 2421550a3f8cc2e196549e7506ad6d7ceb17b1b8 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Fri, 15 Dec 2023 15:19:03 -0800 Subject: [PATCH 1/2] Prepare 7.0.0 release --- .pre-commit-config.yaml | 2 +- CHANGELOG.md | 24 +++++++++++++++------ changelog.d/20231214_124422_rra_DM_42182.md | 3 --- changelog.d/20231214_165219_rra_DM_42182.md | 3 --- changelog.d/20231215_141606_rra.md | 3 --- changelog.d/20231215_143527_rra_DM_42225.md | 3 --- changelog.d/20231215_150943_rra_DM_42225.md | 3 --- 7 files changed, 19 insertions(+), 22 deletions(-) delete mode 100644 changelog.d/20231214_124422_rra_DM_42182.md delete mode 100644 changelog.d/20231214_165219_rra_DM_42182.md delete mode 100644 changelog.d/20231215_141606_rra.md delete mode 100644 changelog.d/20231215_143527_rra_DM_42225.md delete mode 100644 changelog.d/20231215_150943_rra_DM_42225.md diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 26f0b32d..2696836d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -7,7 +7,7 @@ repos: - id: check-toml - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.1.7 + rev: v0.1.8 hooks: - id: ruff args: [--fix, --exit-non-zero-on-fix] diff --git a/CHANGELOG.md b/CHANGELOG.md index 5881945f..2434cae9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,27 @@ # Change log -All notable changes to mobu will be documented in this file. +mobu is versioned with [semver](https://semver.org/). Dependencies are updated to the latest available version during each release. Those changes are not noted here explicitly. -Versioning follows [semver](https://semver.org/). +Find changes for the upcoming release in the project's [changelog.d](https://github.com/lsst-sqre/mobu/tree/main/changelog.d/). -Dependencies are updated to the latest available version during each release. Those changes are not noted here explicitly. + -This project uses [scriv](https://scriv.readthedocs.io/) to maintain the change log. -Changes for the upcoming release can be found in [changelog.d](https://github.com/lsst-sqre/mobu/tree/main/changelog.d/). + +## 7.0.0 (2023-12-15) - +### Backwards-incompatible changes + +- Drop support for cachemachine and Nublado v2. The `cachemachine_image_policy` and `use_cachemachine` configuration options are no longer supported and should be deleted. +- Rename the existing `TAPQueryRunner` business to `TAPQuerySetRunner` to more accurately capture what it does. Add a new `TAPQueryRunner` business that runs queries chosen randomly from a list. Based on work by @stvoutsin. +- Rename `JupyterPythonLoop` to `NubladoPythonLoop` to make it explicit that it requires Nublado and will not work with an arbitrary JupyterHub. + +### New features + +- Convert all configuration options that took intervals in seconds to `timedelta`. Bare numbers will still be interpreted as a number of seconds, but any format Pydantic recognizes as a `timedelta` may now be used. + +### Other changes + +- All environment variables used to configure mobu now start with `MOBU_`, and several have changed their names. The new settings are `MOBU_ALERT_HOOK`, `MOBU_AUTOSTART_PATH`, `MOBU_ENVIRONMENT_URL`, `MOBU_GAFAELFAWR_TOKEN`, `MOBU_NAME`, `MOBU_PATH_PREFIX`, `MOBU_LOGGING_PROFILE`, and `MOBU_LOG_LEVEL`. This is handled by the Phalanx application, so no configuration changes should be required. ## 6.1.1 (2023-07-06) diff --git a/changelog.d/20231214_124422_rra_DM_42182.md b/changelog.d/20231214_124422_rra_DM_42182.md deleted file mode 100644 index 29e4ac9d..00000000 --- a/changelog.d/20231214_124422_rra_DM_42182.md +++ /dev/null @@ -1,3 +0,0 @@ -### Backwards-incompatible changes - -- Rename the existing `TAPQueryRunner` business to `TAPQuerySetRunner` to more accurately capture what it does. Add a new `TAPQueryRunner` business that runs queries chosen randomly from a list. Based on work by @stvoutsin. diff --git a/changelog.d/20231214_165219_rra_DM_42182.md b/changelog.d/20231214_165219_rra_DM_42182.md deleted file mode 100644 index 27e082cb..00000000 --- a/changelog.d/20231214_165219_rra_DM_42182.md +++ /dev/null @@ -1,3 +0,0 @@ -### Other changes - -- All environment variables used to configure mobu now start with `MOBU_`, and several have changed their names. The new settings are `MOBU_ALERT_HOOK`, `MOBU_AUTOSTART_PATH`, `MOBU_ENVIRONMENT_URL`, `MOBU_GAFAELFAWR_TOKEN`, `MOBU_NAME`, `MOBU_PATH_PREFIX`, `MOBU_LOGGING_PROFILE`, and `MOBU_LOG_LEVEL`. This is handled by the Phalanx application, so no configuration changes should be required. diff --git a/changelog.d/20231215_141606_rra.md b/changelog.d/20231215_141606_rra.md deleted file mode 100644 index 5f107b5e..00000000 --- a/changelog.d/20231215_141606_rra.md +++ /dev/null @@ -1,3 +0,0 @@ -### Backwards-incompatible changes - -- Rename `JupyterPythonLoop` to `NubladoPythonLoop` to make it explicit that it requires Nublado and will not work with an arbitrary JupyterHub. diff --git a/changelog.d/20231215_143527_rra_DM_42225.md b/changelog.d/20231215_143527_rra_DM_42225.md deleted file mode 100644 index bc87cfd0..00000000 --- a/changelog.d/20231215_143527_rra_DM_42225.md +++ /dev/null @@ -1,3 +0,0 @@ -### Backwards-incompatible changes - -- Drop support for cachemachine and Nublado v2. The `cachemachine_image_policy` and `use_cachemachine` configuration options are no longer supported and should be deleted. diff --git a/changelog.d/20231215_150943_rra_DM_42225.md b/changelog.d/20231215_150943_rra_DM_42225.md deleted file mode 100644 index 2fa45855..00000000 --- a/changelog.d/20231215_150943_rra_DM_42225.md +++ /dev/null @@ -1,3 +0,0 @@ -### New features - -- Convert all configuration options that took intervals in seconds to `timedelta`. Bare numbers will still be interpreted as a number of seconds, but any format Pydantic recognizes as a `timedelta` may now be used. From 73b96c3953d7a5c6471e9ea0c706f6a905c70fe2 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Fri, 15 Dec 2023 15:36:50 -0800 Subject: [PATCH 2/2] Install Git in the base image Git is required by mobu at runtime to check out notebook repositories. --- scripts/install-base-packages.sh | 4 ++++ scripts/install-dependency-packages.sh | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/install-base-packages.sh b/scripts/install-base-packages.sh index 2fd02247..fade2454 100755 --- a/scripts/install-base-packages.sh +++ b/scripts/install-base-packages.sh @@ -24,6 +24,10 @@ apt-get update # Install security updates. apt-get -y upgrade +# Install dependencies required at runtime. git is used to check out notebook +# repositories. +apt-get -y install --no-install-recommends git + # Delete cached files we don't need anymore. apt-get clean rm -rf /var/lib/apt/lists/* diff --git a/scripts/install-dependency-packages.sh b/scripts/install-dependency-packages.sh index b188b81f..603c91f5 100755 --- a/scripts/install-dependency-packages.sh +++ b/scripts/install-dependency-packages.sh @@ -25,7 +25,6 @@ apt-get update # Install various dependencies that may be required to install mobu: # # build-essential: sometimes needed to build Python modules -# git: required by setuptools_scm # libffi-dev: sometimes needed to build cffi, a cryptography dependency apt-get -y install --no-install-recommends build-essential git libffi-dev