From c228c69c40393a12fe6e871ab91b3d1483803c83 Mon Sep 17 00:00:00 2001 From: Wei Lee Date: Tue, 7 May 2024 11:59:02 +0800 Subject: [PATCH 1/3] build(dockerfile): install required system dep for xmlsec --- python-sdk/tests_integration/astro_deploy/Dockerfile | 2 +- .../tests_integration/astro_deploy/Dockerfile.single_worker | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python-sdk/tests_integration/astro_deploy/Dockerfile b/python-sdk/tests_integration/astro_deploy/Dockerfile index a9560bb7d..eb8621892 100644 --- a/python-sdk/tests_integration/astro_deploy/Dockerfile +++ b/python-sdk/tests_integration/astro_deploy/Dockerfile @@ -10,7 +10,7 @@ RUN apt-get install -y --no-install-recommends \ libssl-dev \ libkrb5-dev \ libmariadb-dev \ - pkg-config + pkg-config libxml2-dev libxmlsec1-dev libxmlsec1-openssl ENV SETUPTOOLS_USE_DISTUTILS=stdlib diff --git a/python-sdk/tests_integration/astro_deploy/Dockerfile.single_worker b/python-sdk/tests_integration/astro_deploy/Dockerfile.single_worker index 037755b31..dd0c8f1fd 100644 --- a/python-sdk/tests_integration/astro_deploy/Dockerfile.single_worker +++ b/python-sdk/tests_integration/astro_deploy/Dockerfile.single_worker @@ -11,7 +11,7 @@ RUN apt-get install -y --no-install-recommends \ libssl-dev \ libkrb5-dev \ libmariadb-dev \ - pkg-config + pkg-config libxml2-dev libxmlsec1-dev libxmlsec1-openssl ENV SETUPTOOLS_USE_DISTUTILS=stdlib From fcfdbc2c5682f6b9e06fd2ed35156224dd68a6f8 Mon Sep 17 00:00:00 2001 From: Wei Lee Date: Tue, 7 May 2024 12:33:16 +0800 Subject: [PATCH 2/3] ci(github-actions): install required system dep for xmlsec --- .github/workflows/ci-python-sdk.yaml | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-python-sdk.yaml b/.github/workflows/ci-python-sdk.yaml index 595cbf2e7..9bba15bcb 100644 --- a/.github/workflows/ci-python-sdk.yaml +++ b/.github/workflows/ci-python-sdk.yaml @@ -95,6 +95,9 @@ jobs: ~/.cache/pip .nox key: ${{ runner.os }}-${{ hashFiles('python-sdk/pyproject.toml') }} + - run: | + sudo apt update + sudo apt-get install pkg-config libxml2-dev libxmlsec1-dev libxmlsec1-openssl - run: pip3 install nox - run: nox -s type_check @@ -113,6 +116,9 @@ jobs: ~/.cache/pip .nox key: ${{ runner.os }}-${{ hashFiles('python-sdk/pyproject.toml') }} + - run: | + sudo apt update + sudo apt-get install pkg-config libxml2-dev libxmlsec1-dev libxmlsec1-openssl - run: pip3 install nox - run: nox -s build_docs @@ -181,6 +187,9 @@ jobs: - run: cat ../.github/ci-test-connections.yaml > test-connections.yaml - run: python -c 'import os; print(os.getenv("GOOGLE_APPLICATION_CREDENTIALS_JSON", "").strip())' > ${{ env.GOOGLE_APPLICATION_CREDENTIALS }} - run: sqlite3 /tmp/sqlite_default.db "VACUUM;" + - run: | + sudo apt update + sudo apt-get install pkg-config libxml2-dev libxmlsec1-dev libxmlsec1-openssl - run: pip3 install nox - run: nox -s test_examples_by_dependency -- --cov=src --cov-report=xml --cov-branch - name: Upload coverage @@ -241,6 +250,9 @@ jobs: .nox key: ${{ runner.os }}-2.8-${{ hashFiles('python-sdk/pyproject.toml') }}-${{ hashFiles('python-sdk/src/astro/__init__.py') }} - run: sqlite3 /tmp/sqlite_default.db "VACUUM;" + - run: | + sudo apt update + sudo apt-get install pkg-config libxml2-dev libxmlsec1-dev libxmlsec1-openssl - run: pip3 install nox - run: nox -s "test-${{ matrix.version }}(airflow='2.8')" -- tests/ --cov=src --cov-report=xml --cov-branch - name: Upload coverage @@ -318,6 +330,9 @@ jobs: - run: cat ../.github/ci-test-connections.yaml > test-connections.yaml - run: python -c 'import os; print(os.getenv("GOOGLE_APPLICATION_CREDENTIALS_JSON", "").strip())' > ${{ env.GOOGLE_APPLICATION_CREDENTIALS }} - run: sqlite3 /tmp/sqlite_default.db "VACUUM;" + - run: | + sudo apt update + sudo apt-get install pkg-config libxml2-dev libxmlsec1-dev libxmlsec1-openssl - run: pip3 install nox - run: nox -s "test-3.10(airflow='2.8')" -- tests_integration/ -k "test_load_file.py and not redshift" --splits 3 --group ${{ matrix.group }} --store-durations --durations-path /tmp/durations-${{ matrix.group }} --cov=src --cov-report=xml --cov-branch - run: cat /tmp/durations-${{ matrix.group }} @@ -414,6 +429,9 @@ jobs: - run: cat ../.github/ci-test-connections.yaml > test-connections.yaml - run: python -c 'import os; print(os.getenv("GOOGLE_APPLICATION_CREDENTIALS_JSON", "").strip())' > ${{ env.GOOGLE_APPLICATION_CREDENTIALS }} - run: sqlite3 /tmp/sqlite_default.db "VACUUM;" + - run: | + sudo apt update + sudo apt-get install pkg-config libxml2-dev libxmlsec1-dev libxmlsec1-openssl - run: pip3 install nox - run: nox -s "test-3.10(airflow='2.8')" -- tests_integration/ -k "test_example_dags.py and not redshift" --splits 3 --group ${{ matrix.group }} --store-durations --durations-path /tmp/durations-${{ matrix.group }} --cov=src --cov-report=xml --cov-branch - run: cat /tmp/durations-${{ matrix.group }} @@ -509,7 +527,10 @@ jobs: key: ${{ runner.os }}-2.8-${{ hashFiles('python-sdk/pyproject.toml') }}-${{ hashFiles('python-sdk/src/astro/__init__.py') }} - run: cat ../.github/ci-test-connections.yaml > test-connections.yaml - run: python -c 'import os; print(os.getenv("GOOGLE_APPLICATION_CREDENTIALS_JSON", "").strip())' > ${{ env.GOOGLE_APPLICATION_CREDENTIALS }} - - run: sqlite3 /tmp/sqlite_default.db "VACUUM;" + - run: sqlite3 /tmp/sqlite_default.db "VACUUM;" + - run: | + sudo apt update + sudo apt-get install pkg-config libxml2-dev libxmlsec1-dev libxmlsec1-openssl - run: pip3 install nox - run: nox -s "test-3.10(airflow='2.8')" -- tests_integration/ -k "not test_load_file.py and not test_example_dags.py and not redshift" --splits 11 --group ${{ matrix.group }} --store-durations --durations-path /tmp/durations-${{ matrix.group }} --cov=src --cov-report=xml --cov-branch - run: cat /tmp/durations-${{ matrix.group }} @@ -658,6 +679,9 @@ jobs: with: path: ~/.cache/pip key: ${{ hashFiles('python-sdk/pyproject.toml') }} + - run: | + sudo apt update + sudo apt-get install pkg-config libxml2-dev libxmlsec1-dev libxmlsec1-openssl - run: pip3 install nox - run: nox -s build - run: nox -s release -- dist/* From d2dc7ecd99e2b13b6c04a16a1b7b98c3df36837f Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 7 May 2024 04:33:36 +0000 Subject: [PATCH 3/3] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .github/workflows/ci-python-sdk.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-python-sdk.yaml b/.github/workflows/ci-python-sdk.yaml index 9bba15bcb..dad2669e4 100644 --- a/.github/workflows/ci-python-sdk.yaml +++ b/.github/workflows/ci-python-sdk.yaml @@ -527,7 +527,7 @@ jobs: key: ${{ runner.os }}-2.8-${{ hashFiles('python-sdk/pyproject.toml') }}-${{ hashFiles('python-sdk/src/astro/__init__.py') }} - run: cat ../.github/ci-test-connections.yaml > test-connections.yaml - run: python -c 'import os; print(os.getenv("GOOGLE_APPLICATION_CREDENTIALS_JSON", "").strip())' > ${{ env.GOOGLE_APPLICATION_CREDENTIALS }} - - run: sqlite3 /tmp/sqlite_default.db "VACUUM;" + - run: sqlite3 /tmp/sqlite_default.db "VACUUM;" - run: | sudo apt update sudo apt-get install pkg-config libxml2-dev libxmlsec1-dev libxmlsec1-openssl