From 399dd0b9ecfbfdf90d4ece677f1845a1725c9d80 Mon Sep 17 00:00:00 2001 From: Matthew Evans <7916000+ml-evs@users.noreply.github.com> Date: Tue, 20 Aug 2024 00:03:29 +0100 Subject: [PATCH] Remove release workflow now that versions are dynamic (#847) * Update CHANGELOG * Remove release workflow now that versions are handled dynamically * Point dependabot to correct directory --- .github/dependabot.yml | 2 +- .github/utils/update_docs.sh | 17 --------- .github/workflows/ci_release.yml | 59 -------------------------------- CHANGELOG.md | 38 +++++++++++++++++--- 4 files changed, 35 insertions(+), 81 deletions(-) delete mode 100755 .github/utils/update_docs.sh delete mode 100644 .github/workflows/ci_release.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml index b164264e9..b583717cf 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,7 +1,7 @@ version: 2 updates: - package-ecosystem: pip - directory: "/" + directory: "./pydatalab" schedule: interval: monthly day: monday diff --git a/.github/utils/update_docs.sh b/.github/utils/update_docs.sh deleted file mode 100755 index e400e7131..000000000 --- a/.github/utils/update_docs.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -set -e - -echo -e "\n-o- Setting commit user -o-" -git config --global user.email "${GIT_USER_EMAIL}" -git config --global user.name "${GIT_USER_NAME}" - -echo "\n-o- Update version -o-" -cd pydatalab -pipenv run invoke dev.set-version -v ${GITHUB_REF#refs/tags/} - -echo "\n-o- Commit updates - Changelog -o-" -git add pydatalab/__init__.py -git commit --allow-empty -m "Release ${GITHUB_REF#refs/tags/}" - -echo -e "\n-o- Update version tag -o-" -git tag -f ${GITHUB_REF#refs/tags/} diff --git a/.github/workflows/ci_release.yml b/.github/workflows/ci_release.yml deleted file mode 100644 index 5c0b5a870..000000000 --- a/.github/workflows/ci_release.yml +++ /dev/null @@ -1,59 +0,0 @@ -name: Release workflow - -on: - release: - types: - - published - -env: - PUBLISH_UPDATE_BRANCH: main - GIT_USER_NAME: "Greymon (bot)" - GIT_USER_EMAIL: "git-bot@datalab-org.io" - # Need to set this to avoid pipenv syncing an entire LFS repo and failing with bandwidth quota (see - # https://github.com/the-grey-group/datalab/issues/603) - GIT_LFS_SKIP_SMUDGE: 1 - -jobs: - publish: - runs-on: ubuntu-latest - if: github.repository == 'datalab-org/datalab' && startsWith(github.ref, 'refs/tags/v') - env: - PUBLISH_UPDATE_BRANCH: main - - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - name: Set up Python 3.10 - uses: actions/setup-python@v4 - with: - python-version: "3.10" - - - name: Install dependencies - working-directory: ./pydatalab - run: | - python -m pip install --upgrade pip - pip install -U setuptools - pip install pipenv - pipenv sync --dev - pipenv run pip install invoke - pipenv run pip install -e . - - - name: Set git config - run: | - git config --global user.name "${{ env.GIT_USER_NAME }}" - git config --global user.email "${{ env.GIT_USER_EMAIL }}" - - - name: Update version - run: .github/utils/update_docs.sh - - - name: Update '${{ env.PUBLISH_UPDATE_BRANCH }}' - uses: CasperWA/push-protected@v2 - with: - token: ${{ secrets.BOT_PAT }} - branch: ${{ env.PUBLISH_UPDATE_BRANCH }} - unprotect_reviews: true - sleep: 15 - force: true - tags: true diff --git a/CHANGELOG.md b/CHANGELOG.md index 7de2e03ac..c7c57746e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,40 @@ # Changelog -## v0.4.3 (July 2024 +## v0.5.0-rc.1 (August 2024) + +This release candidate changes how the Python server is packaged in a potentially breaking way, with the aim to make it significantly easier to develop datalab plugins. Attempts at backwards compatibility with the former pipenv approach will be maintained for at least this minor release cycle. + +### What's Changed + +* CI build time and fork compatibility improvements by @ml-evs in https://github.com/datalab-org/datalab/pull/833 +* Tweak cache usage on docker builds by @ml-evs in https://github.com/datalab-org/datalab/pull/841 +* Repackage server as proper Python package, removing `pipenv` by @ml-evs in https://github.com/datalab-org/datalab/pull/604 +* Re-enable dependabot for Python dependencies by @ml-evs in https://github.com/datalab-org/datalab/pull/845 + +**Full Changelog**: https://github.com/datalab-org/datalab/compare/v0.4.4...v0.5.0-rc.1 + + +## v0.4.4 (August 2024) + +This release primarily contains some bugfixes for the echem block, as well as tidying in preparation of the next release. + +### What's Changed +* Removed unused css by @BenjaminCharmes in https://github.com/datalab-org/datalab/pull/826 +* Remove final mentions of odbx.science by @ml-evs in https://github.com/datalab-org/datalab/pull/827 +* Add routes for resolving items by refcode by @ml-evs in https://github.com/datalab-org/datalab/pull/807 +* Fix block errors caused by seemingly defunct theme options in bokeh by @ml-evs in https://github.com/datalab-org/datalab/pull/829 +* Update to latest navani version, fixing Neware normalisation issues by @ml-evs in https://github.com/datalab-org/datalab/pull/836 +* Reload echem data by default, unless disabled by @ml-evs in https://github.com/datalab-org/datalab/pull/840 + + +**Full Changelog**: https://github.com/datalab-org/datalab/compare/v0.4.3...v0.4.4 + + +## v0.4.3 (July 2024) This release simply re-enables Firefox testing in the CI, and reorganises the associated cloud runs. -## What's Changed +### What's Changed * Re-enable Firefox e2e tests by @ml-evs in https://github.com/datalab-org/datalab/pull/711 **Full Changelog**: https://github.com/datalab-org/datalab/compare/v0.4.2...v0.4.3 @@ -14,7 +44,7 @@ This release simply re-enables Firefox testing in the CI, and reorganises the as This release adds an update to the batch item creation UI to include other item types, and includes a new preview of the tabular UI which can be accessed at the path `/next`, as well as several UI tweaks and fixes. -## What's Changed +### What's Changed * Rebrand repo to the group-agnostic gh organisation by @ml-evs in https://github.com/datalab-org/datalab/pull/809 * Change docker compose restart policy to "unless-stopped" by @ml-evs in https://github.com/datalab-org/datalab/pull/810 @@ -32,7 +62,7 @@ This release adds an update to the batch item creation UI to include other item This minor release adds some quality-of-life fixes to the UI, a new cell format type "in situ (optical)" and tweaks to our development workflow. -## What's Changed +### What's Changed * Run vue3-recommended linting by @jdbocarsly in https://github.com/the-grey-group/datalab/pull/756 * Corrected blockInfo computed property value by @BenjaminCharmes in https://github.com/the-grey-group/datalab/pull/775