Skip to content

Commit

Permalink
merge master
Browse files Browse the repository at this point in the history
  • Loading branch information
d80tb7 committed Jan 18, 2025
2 parents ee857b4 + 715c832 commit aed8a47
Show file tree
Hide file tree
Showing 21 changed files with 198 additions and 1,236 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/airflow-operator-release-to-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ jobs:
- run: go run github.com/magefile/[email protected] -v airflowOperator
- uses: ./.github/workflows/python-tests
with:
python-version: '3.8'
tox-env: 'py38'
python-version: '3.10'
tox-env: 'py310'
path: third_party/airflow
github-token: ${{secrets.GITHUB_TOKEN}}
- name: Publish package to PyPI
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/airflow-operator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,14 @@ jobs:
runs-on: ubuntu-22.04
strategy:
matrix:
python: [ '3.8', '3.9', '3.10' ]
python: [ '3.10', '3.11', '3.12' ]
include:
- tox-env: 'py38'
- tox-env: 'py39'
python: '3.9'
- tox-env: 'py310'
python: '3.10'
- tox-env: 'py311'
python: '3.11'
- tox-env: 'py312'
python: '3.12'
steps:
- uses: actions/checkout@v4
- name: Setup Go
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/python-client-release-to-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ jobs:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- uses: ./.github/workflows/python-tests
with:
python-version: '3.8'
tox-env: 'py38'
python-version: '3.9'
tox-env: 'py39'
path: 'client/python'
github-token: ${{secrets.GITHUB_TOKEN}}
- name: Publish package to PyPI
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/python-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,16 @@ jobs:
runs-on: ubuntu-22.04
strategy:
matrix:
python: [ '3.8', '3.9', '3.10' ]
python: [ '3.9', '3.10', '3.11', '3.12' ]
include:
- tox-env: 'py38'
- tox-env: 'py39'
python: '3.9'
- tox-env: 'py310'
python: '3.10'
- tox-env: 'py311'
python: '3.11'
- tox-env: 'py312'
python: '3.12'
steps:
- uses: actions/checkout@v4
- name: Setup Go
Expand Down
2 changes: 1 addition & 1 deletion build/airflow-operator/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG PLATFORM=x86_64
ARG BASE_IMAGE=python:3.10.14-bookworm
ARG BASE_IMAGE=python:3.10-bookworm
FROM --platform=$PLATFORM ${BASE_IMAGE}

RUN mkdir /proto
Expand Down
3 changes: 1 addition & 2 deletions build/python-client/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
ARG PLATFORM=x86_64
ARG BASE_IMAGE=python:3.8.18-bookworm

ARG BASE_IMAGE=python:3.9-bookworm
FROM --platform=$PLATFORM ${BASE_IMAGE}

RUN mkdir /proto
Expand Down
8 changes: 4 additions & 4 deletions client/python/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
[project]
name = "armada_client"
version = "0.4.8"
version = "0.4.10"
description = "Armada gRPC API python client"
readme = "README.md"
requires-python = ">=3.7"
requires-python = ">=3.9"
dependencies = ["grpcio==1.66.1", "grpcio-tools==1.66.1", "mypy-protobuf>=3.2.0", "protobuf>=5.26.1,<6.0dev" ]
license = { text = "Apache Software License" }
authors = [{ name = "G-Research Open Source Software", email = "[email protected]" }]

[project.optional-dependencies]
format = ["black==23.7.0", "flake8==7.0.0", "pylint==2.17.5"]
format = ["black>=23.7.0", "flake8>=7.0.0", "pylint>=2.17.5"]
# note(JayF): sphinx-jekyll-builder was broken by sphinx-markdown-builder 0.6 -- so pin to 0.5.5
docs = ["sphinx==7.1.2", "sphinx-jekyll-builder==0.3.0", "sphinx-toolbox==3.2.0b1", "sphinx-markdown-builder==0.5.5"]
test = ["pytest==7.3.1", "coverage>=6.5.0", "pytest-asyncio==0.21.1"]
test = ["pytest==7.3.1", "coverage==6.5.0", "pytest-asyncio==0.21.1"]

[build-system]
requires = ["setuptools"]
Expand Down
4 changes: 4 additions & 0 deletions config/lookoutv2/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,7 @@ uiConfig:
template: "kubectl --context {{ runs[runs.length - 1].cluster }} -n {{ namespace }} logs armada-{{ jobId }}-0"
- name: Exec
template: "kubectl --context {{ runs[runs.length - 1].cluster }} -n {{ namespace }} exec -it armada-{{ jobId }}-0 /bin/sh"
descriptionMd: Execute a command on the job's container.
alertMessageMd: |
This will only work if the container is still running.
alertLevel: info
86 changes: 0 additions & 86 deletions internal/executor/util/ingress_service_config.go

This file was deleted.

117 changes: 0 additions & 117 deletions internal/executor/util/ingress_util.go

This file was deleted.

Loading

0 comments on commit aed8a47

Please sign in to comment.