merge: add gapit branch as main branch

.github/workflows/docker.yml

@@ -1,39 +1,42 @@
-name: Docker Build and Push
+name: Docker
 
 on:
   push:
     branches: [ master, release/* ]
+    tags: [ '**' ]
+
+env:
+  SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
 
 jobs:
   build:
+    name: Build & Push
     runs-on: ubuntu-latest
     env:
-      REPOSITORY_URL: docker.pkg.github.com
-      IMAGE_NAME: ${{ github.repository }}/alerta-cli
-      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+      REPOSITORY_URL: ghcr.io
+      IMAGE_NAME: ${{ github.repository_owner }}/alerta-cli
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
-      - name: Variables
-        id: vars
-        run: echo "::set-output name=SHORT_COMMIT_ID::$(git rev-parse --short HEAD)"
+        uses: actions/checkout@v4
       - name: Build image
         id: docker-build
         run: >-
           docker build
           -t $IMAGE_NAME
-          -t $REPOSITORY_URL/$IMAGE_NAME:${{ steps.vars.outputs.SHORT_COMMIT_ID }}
+          -t $REPOSITORY_URL/$IMAGE_NAME:$(cat VERSION)
+          -t $REPOSITORY_URL/$IMAGE_NAME:$(git rev-parse --short HEAD)
           -t $REPOSITORY_URL/$IMAGE_NAME:latest .
       - name: Docker Login
-        env:
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
-        run: docker login $REPOSITORY_URL --username "$DOCKER_USERNAME" --password "$DOCKER_PASSWORD"
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REPOSITORY_URL }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       - name: Publish Image
         id: docker-push
-        run: docker push $REPOSITORY_URL/$IMAGE_NAME
+        run: docker push --all-tags $REPOSITORY_URL/$IMAGE_NAME
 
-      - uses: act10ns/slack@v1
+      - uses: act10ns/slack@v2
         with:
           status: ${{ job.status }}
           steps: ${{ toJson(steps) }}

.github/workflows/release.yml

@@ -0,0 +1,82 @@
+name: Release
+
+on:
+  push:
+    tags: [ 'v*' ]
+
+env:
+  SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+
+jobs:
+  test:
+    name: Test
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Python 3.11
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.11
+      - name: Install dependencies
+        id: install-deps
+        run: |
+          python3 -m pip install --upgrade pip
+          pip install flake8 pytest
+          pip install -r requirements.txt
+          pip install -r requirements-dev.txt
+          pip install .
+      - name: Pre-commit hooks
+        id: hooks
+        run: |
+          pre-commit run -a --show-diff-on-failure
+      - name: Test with pytest
+        id: test
+        run: |
+          pytest --cov=alertaclient tests/unit
+      - uses: act10ns/slack@v2
+        with:
+          status: ${{ job.status }}
+          steps: ${{ toJson(steps) }}
+        if: failure()
+
+  release:
+    name: Publish
+    needs: test
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Python 3.11
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.11
+      - name: Build
+        id: build
+        run: |
+          python3 -m pip install --upgrade build
+          python3 -m build
+          zip alerta-api.zip -r dist/*
+          tar cvfz alerta-api.tar.gz dist/*
+      - name: Release
+        id: create-release
+        uses: softprops/action-gh-release@v2
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          tag_name: ${{ github.ref }}
+          name: Release ${{ github.ref }}
+          draft: false
+          prerelease: ${{ contains(github.ref_name, '-') }}
+          files: |
+            ./alerta-api.zip
+            ./alerta-api.tar.gz
+
+      - uses: act10ns/slack@v2
+        with:
+          status: ${{ job.status }}
+          steps: ${{ toJson(steps) }}
+
+      - name: Test Install
+        run: |
+          python3 -m pip install --upgrade alerta
+          python3 -m pip freeze

.github/workflows/github-ci.yml → .github/workflows/tests.yml

@@ -1,27 +1,26 @@
-name: CI Tests
+name: Tests
 
 on:
   push:
-    branches: [ master, release/* ]
   pull_request:
     branches: [ master ]
 
+env:
+  SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+  REPOSITORY_URL: docker.pkg.github.com
+
 jobs:
   test:
     runs-on: ubuntu-latest
-    env:
-      REPOSITORY_URL: docker.pkg.github.com
-      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
 
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: ['3.10', '3.11', '3.12']
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+      - uses: actions/checkout@v4
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
@@ -41,30 +40,17 @@ jobs:
         run: |
           flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
           flake8 . --count --exit-zero --max-complexity=50 --max-line-length=127 --statistics
-      - name: Type Check
-        id: types
-        run: |
-          python -m mypy alertaclient/
       - name: Test with pytest
         id: unit-test
-        env:
-          DATABASE_URL: postgres://postgres:postgres@localhost:5432/alerta
         run: |
           pytest --cov=alertaclient tests/unit
-      - name: Docker Login
-        env:
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          docker login $REPOSITORY_URL --username "$DOCKER_USERNAME" --password "$DOCKER_PASSWORD"
       - name: Integration Test
         id: integration-test
         run: |
-          docker-compose -f docker-compose.ci.yaml build sut
-          docker-compose -f docker-compose.ci.yaml up --exit-code-from sut
-          docker-compose -f docker-compose.ci.yaml rm --stop --force
-
-      - uses: act10ns/slack@v1
+          docker compose -f docker-compose.ci.yaml build sut
+          docker compose -f docker-compose.ci.yaml up --exit-code-from sut
+          docker compose -f docker-compose.ci.yaml rm --stop --force
+      - uses: act10ns/slack@v2
         with:
           status: ${{ job.status }}
           steps: ${{ toJson(steps) }}

.pre-commit-config.yaml

@@ -1,10 +1,10 @@
 repos:
--   repo: https://github.com/pre-commit/mirrors-autopep8
-    rev: v1.5.1
+-   repo: https://github.com/hhatto/autopep8
+    rev: v2.0.4
     hooks:
     -   id: autopep8
 -   repo: https://github.com/pre-commit/pre-commit-hooks.git
-    rev: v2.5.0
+    rev: v4.5.0
     hooks:
     -   id: check-added-large-files
     -   id: check-ast
@@ -17,25 +17,25 @@ repos:
     -   id: debug-statements
     -   id: double-quote-string-fixer
     -   id: end-of-file-fixer
-    -   id: flake8
     -   id: fix-encoding-pragma
         args: ['--remove']
     -   id: pretty-format-json
         args: ['--autofix']
     -   id: name-tests-test
         args: ['--django']
+        exclude: ^tests/helpers/
     -   id: requirements-txt-fixer
     -   id: trailing-whitespace
+-   repo: https://github.com/pycqa/flake8
+    rev: 6.1.0
+    hooks:
+    -   id: flake8
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v1.27.0
+    rev: v3.21.2
     hooks:
     -   id: pyupgrade
         args: ['--py3-plus']
--   repo: https://github.com/asottile/seed-isort-config
-    rev: v1.9.4
-    hooks:
-    -   id: seed-isort-config
--   repo: https://github.com/pre-commit/mirrors-isort
-    rev: v4.3.21
+-   repo: https://github.com/PyCQA/isort
+    rev: 7.0.0
     hooks:
     -   id: isort

CHANGELOG.md

@@ -1 +1,37 @@
-## Unreleased
+## v8.5.2 (2023-03-18)
+
+### Refactor
+
+- convert formatted strings to f-strings (#272)
+
+## v8.5.1 (2021-11-21)
+
+### Feat
+
+- Add a --alert flag to alert keys to alert on expired and expiring key (#274)
+- Add option to use custom value when creating API key (#270)
+
+### Refactor
+
+- convert formatted strings to f-strings (#272)
+- assign api key directly (#271)
+
+## v8.5.0 (2021-04-18)
+
+### Fix
+
+- improve alert note command (#263)
+- consistent use of ID as metavar (#262)
+- add scopes cmd and minor fixes (#257)
+- **build**: run tests against correct branch
+
+### Feat
+
+- add examples for group cmd (#261)
+- add and remove users to/from groups (#260)
+- add option to list users to group cmd (#259)
+- add option to list groups to user cmd (#258)
+- add alerts command for list alert attributes (#256)
+- show user details (#255)
+- add option to show decoded auth token claims (#254)
+- **auth**: add HMAC authentication as config option (#248)