diff --git a/.github/actions/setup-backend/action.yml b/.github/actions/setup-backend/action.yml index d3624bf53..1b29caf89 100644 --- a/.github/actions/setup-backend/action.yml +++ b/.github/actions/setup-backend/action.yml @@ -24,6 +24,7 @@ runs: cache: ${{ inputs.cache }} - name: Install dependencies run: | + sudo apt-get update && sudo apt-get -y install libldap2-dev libsasl2-dev pip install --upgrade pip setuptools wheel if [ "${{ inputs.requirements-type }}" = "dev" ]; then pip install -r requirements/development.txt diff --git a/.github/workflows/bashlib.sh b/.github/workflows/bashlib.sh index 5633041f7..e34101ad7 100644 --- a/.github/workflows/bashlib.sh +++ b/.github/workflows/bashlib.sh @@ -31,20 +31,6 @@ say() { fi } -# default command to run when the `run` input is empty -default-setup-command() { - apt-get-install - pip-upgrade -} - -apt-get-install() { - say "::group::apt-get install dependencies" - sudo apt-get update && sudo apt-get install --yes \ - libsasl2-dev \ - libldap2-dev - say "::endgroup::" -} - pip-upgrade() { say "::group::Upgrade pip" pip install --upgrade pip diff --git a/.github/workflows/superset-e2e.yml b/.github/workflows/superset-e2e.yml index 4c2423238..9086c6d0e 100644 --- a/.github/workflows/superset-e2e.yml +++ b/.github/workflows/superset-e2e.yml @@ -67,14 +67,6 @@ jobs: PR_NUMBER: ${{ github.event.pull_request.number }} continue-on-error: true run: ./scripts/ci_check_no_file_changes.sh python frontend - - name: Setup Python - if: steps.check.outcome == 'failure' - uses: ./.github/actions/setup-backend/ - - name: OS dependencies - if: steps.check.outcome == 'failure' - uses: ./.github/actions/cached-dependencies - with: - run: apt-get-install - name: Setup Python uses: ./.github/actions/setup-backend/ if: steps.check.outcome == 'failure' diff --git a/.github/workflows/superset-translations.yml b/.github/workflows/superset-translations.yml index fb00f9f2e..b088e5d83 100644 --- a/.github/workflows/superset-translations.yml +++ b/.github/workflows/superset-translations.yml @@ -50,12 +50,5 @@ jobs: uses: ./.github/actions/setup-backend/ with: python-version: ${{ matrix.python-version }} - - name: Install dependencies - uses: ./.github/actions/cached-dependencies - with: - run: | - apt-get-install - pip-upgrade - pip install -r requirements/base.txt - name: Test babel extraction run: ./scripts/babel_update.sh diff --git a/requirements/base.txt b/requirements/base.txt index 8d33f71ba..208c5132a 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -7,7 +7,7 @@ # -e file:. # via -r requirements/base.in -alembic==1.6.5 +alembic==1.13.1 # via flask-migrate amqp==5.1.1 # via kombu @@ -282,7 +282,6 @@ pyrsistent==0.20.0 # via jsonschema python-dateutil==2.8.2 # via - # alembic # apache-superset # celery # croniter @@ -292,8 +291,6 @@ python-dateutil==2.8.2 # shillelagh python-dotenv==0.19.0 # via apache-superset -python-editor==1.0.4 - # via alembic python-geohash==0.8.5 # via apache-superset pytz==2021.3 @@ -358,6 +355,7 @@ tabulate==0.8.9 # via apache-superset typing-extensions==4.4.0 # via + # alembic # apache-superset # cattrs # flask-limiter