Skip to content

Commit

Permalink
Update Airflow version and exception for Python package license
Browse files Browse the repository at this point in the history
  • Loading branch information
jdddog committed Mar 17, 2024
1 parent f321eb7 commit 1982cb4
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -e observatory-api[tests] --constraint https://raw.githubusercontent.com/apache/airflow/constraints-2.6.3/constraints-no-providers-${{ matrix.python-version }}.txt
pip install -e observatory-platform[tests] --constraint https://raw.githubusercontent.com/apache/airflow/constraints-2.6.3/constraints-no-providers-${{ matrix.python-version }}.txt
pip install -e observatory-api[tests] --constraint https://raw.githubusercontent.com/apache/airflow/constraints-2.8.3/constraints-no-providers-${{ matrix.python-version }}.txt
pip install -e observatory-platform[tests] --constraint https://raw.githubusercontent.com/apache/airflow/constraints-2.8.3/constraints-no-providers-${{ matrix.python-version }}.txt
- name: Check licenses
run: |
Expand Down
2 changes: 1 addition & 1 deletion bin/generate-api-client.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if ! command -v openapi-generator-cli &>/dev/null; then
fi

if ! command -v observatory-api &>/dev/null; then
pip install -e observatory-api --constraint https://raw.githubusercontent.com/apache/airflow/constraints-2.6.3/constraints-no-providers-3.10.txt
pip install -e observatory-api --constraint https://raw.githubusercontent.com/apache/airflow/constraints-2.8.3/constraints-no-providers-3.10.txt
fi

# Directories
Expand Down
2 changes: 1 addition & 1 deletion docs/api/api_client.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ To install the package from source:
```bash
git clone https://github.com/The-Academic-Observatory/observatory-platform.git
cd observatory-platform
pip install -e observatory-api --constraint https://raw.githubusercontent.com/apache/airflow/constraints-2.6.3/constraints-no-providers-3.10.txt
pip install -e observatory-api --constraint https://raw.githubusercontent.com/apache/airflow/constraints-2.8.3/constraints-no-providers-3.10.txt
```

## Getting Started
Expand Down
2 changes: 1 addition & 1 deletion install.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

venv_observatory_platform="observatory_venv"
airflow_version="2.6.3"
airflow_version="2.8.3"
python_version="3.10"

function set_os_arch() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
HOST_UID = os.getuid()
DEBUG = False
PYTHON_VERSION = "3.10"
AIRFLOW_VERSION = "2.7.3"
AIRFLOW_VERSION = "2.8.3"


class PlatformRunner(ComposeRunner):
Expand Down
2 changes: 1 addition & 1 deletion observatory-platform/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
observatory-api

# Airflow
apache-airflow[redis,celery,slack,http]==2.7.3
apache-airflow[redis,celery,slack,http]==2.8.3
astronomer-starship

# Google Cloud
Expand Down
3 changes: 3 additions & 0 deletions strategy.ini
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,6 @@ precipy: >=0.2.2
# Apache 2.0 license, but this is not classified properly, see https://github.com/p1c2u/openapi-spec-validator/issues/138
openapi-spec-validator: >=0.3.1,<1

# Propriety license, however this is required to migrate to Astronomer.io
astronomer-starship: >=2,<3

0 comments on commit 1982cb4

Please sign in to comment.