forked from apache/superset
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into feat/fileter_set
* master: (582 commits) feat: config to customize bootstrap data overrides (apache#16386) fix: regex for multi-region IPs (apache#16410) chore: Changes the DatabaseSelector to use the new Select component (apache#16334) chore: Displays the dataset description in a tooltip in the datasets list (apache#16392) fix(pylint): Fix master (apache#16405) chore(pylint): Enable useless-suppression check (apache#16388) feat: Add extraVolumes and extraVolumeMounts to all main containers (apache#16361) initial commit (apache#16366) fix: big number default date format (apache#16383) initial commit (apache#16380) fix: import dashboard w/o metadata (apache#16360) test: Functional RTL for email report modal II (apache#16148) fix: update table ID in query context on chart import (apache#16374) docs: document FLASK_APP_MUTATOR (apache#16286) feat: Add new dev commands to Makefile (apache#16327) fix: call external metadata endpoint with correct rison object (apache#16369) fix: Fix parsing onSaving reports toast when user hasn't saved chart (apache#16330) fix: columns/index rebuild (apache#16355) chore(viz): bump deckgl plugin to 0.4.11 (apache#16353) fix: Blank space in Change dataset modal without warning message (apache#16324) ... # Conflicts: # superset/app.py # superset/models/dashboard.py # tests/integration_tests/charts/filter_sets/__init__.py # tests/integration_tests/charts/filter_sets/conftest.py # tests/integration_tests/charts/filter_sets/consts.py # tests/integration_tests/charts/filter_sets/create_api_tests.py # tests/integration_tests/charts/filter_sets/delete_api_tests.py # tests/integration_tests/charts/filter_sets/get_api_tests.py # tests/integration_tests/charts/filter_sets/update_api_tests.py # tests/integration_tests/charts/filter_sets/utils.py # tests/integration_tests/superset_test_config.py
- Loading branch information
Showing
961 changed files
with
56,090 additions
and
22,774 deletions.
There are no files selected for viewing
Validating CODEOWNERS rules …
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,193 @@ | ||
| # Python integration tests | ||
| name: Python-Integration | ||
|
|
||
| on: | ||
| push: | ||
| branches-ignore: | ||
| - "dependabot/npm_and_yarn/**" | ||
| pull_request: | ||
| types: [synchronize, opened, reopened, ready_for_review] | ||
|
|
||
| jobs: | ||
| test-mysql: | ||
| if: github.event.pull_request.draft == false | ||
| runs-on: ubuntu-20.04 | ||
| strategy: | ||
| matrix: | ||
| python-version: [3.7] | ||
| env: | ||
| PYTHONPATH: ${{ github.workspace }} | ||
| SUPERSET_CONFIG: tests.integration_tests.superset_test_config | ||
| REDIS_PORT: 16379 | ||
| SUPERSET__SQLALCHEMY_DATABASE_URI: | | ||
| mysql+mysqldb://superset:superset@127.0.0.1:13306/superset?charset=utf8mb4&binary_prefix=true | ||
| services: | ||
| mysql: | ||
| image: mysql:5.7 | ||
| env: | ||
| MYSQL_ROOT_PASSWORD: root | ||
| ports: | ||
| - 13306:3306 | ||
| redis: | ||
| image: redis:5-alpine | ||
| options: --entrypoint redis-server | ||
| ports: | ||
| - 16379:6379 | ||
| steps: | ||
| - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )" | ||
| uses: actions/checkout@v2 | ||
| with: | ||
| persist-credentials: false | ||
| submodules: recursive | ||
| - name: Check if python changes are present | ||
| id: check | ||
| env: | ||
| GITHUB_REPO: ${{ github.repository }} | ||
| PR_NUMBER: ${{ github.event.pull_request.number }} | ||
| continue-on-error: true | ||
| run: ./scripts/ci_check_no_file_changes.sh python | ||
| - name: Setup Python | ||
| if: steps.check.outcome == 'failure' | ||
| uses: actions/setup-python@v2 | ||
| with: | ||
| python-version: ${{ matrix.python-version }} | ||
| - name: Install dependencies | ||
| if: steps.check.outcome == 'failure' | ||
| uses: ./.github/actions/cached-dependencies | ||
| with: | ||
| run: | | ||
| apt-get-install | ||
| pip-upgrade | ||
| pip install -r requirements/testing.txt | ||
| setup-mysql | ||
| - name: Run celery | ||
| if: steps.check.outcome == 'failure' | ||
| run: celery --app=superset.tasks.celery_app:app worker -Ofair -c 2 & | ||
| - name: Python integration tests (MySQL) | ||
| if: steps.check.outcome == 'failure' | ||
| run: | | ||
| ./scripts/python_tests.sh | ||
| - name: Upload code coverage | ||
| if: steps.check.outcome == 'failure' | ||
| run: | | ||
| bash .github/workflows/codecov.sh -c -F python -F mysql | ||
| test-postgres: | ||
| if: github.event.pull_request.draft == false | ||
| runs-on: ubuntu-20.04 | ||
| strategy: | ||
| matrix: | ||
| python-version: [3.7, 3.8] | ||
| env: | ||
| PYTHONPATH: ${{ github.workspace }} | ||
| SUPERSET_CONFIG: tests.integration_tests.superset_test_config | ||
| REDIS_PORT: 16379 | ||
| SUPERSET__SQLALCHEMY_DATABASE_URI: postgresql+psycopg2://superset:superset@127.0.0.1:15432/superset | ||
| services: | ||
| postgres: | ||
| image: postgres:10-alpine | ||
| env: | ||
| POSTGRES_USER: superset | ||
| POSTGRES_PASSWORD: superset | ||
| ports: | ||
| # Use custom ports for services to avoid accidentally connecting to | ||
| # GitHub action runner's default installations | ||
| - 15432:5432 | ||
| redis: | ||
| image: redis:5-alpine | ||
| ports: | ||
| - 16379:6379 | ||
| steps: | ||
| - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )" | ||
| uses: actions/checkout@v2 | ||
| with: | ||
| persist-credentials: false | ||
| submodules: recursive | ||
| - name: Check if python changes are present | ||
| id: check | ||
| env: | ||
| GITHUB_REPO: ${{ github.repository }} | ||
| PR_NUMBER: ${{ github.event.pull_request.number }} | ||
| continue-on-error: true | ||
| run: ./scripts/ci_check_no_file_changes.sh python | ||
| - name: Setup Python | ||
| if: steps.check.outcome == 'failure' | ||
| uses: actions/setup-python@v2 | ||
| with: | ||
| python-version: ${{ matrix.python-version }} | ||
| - name: Install dependencies | ||
| if: steps.check.outcome == 'failure' | ||
| uses: ./.github/actions/cached-dependencies | ||
| with: | ||
| run: | | ||
| apt-get-install | ||
| pip-upgrade | ||
| pip install -r requirements/testing.txt | ||
| setup-postgres | ||
| - name: Run celery | ||
| if: steps.check.outcome == 'failure' | ||
| run: celery --app=superset.tasks.celery_app:app worker -Ofair -c 2 & | ||
| - name: Python integration tests (PostgreSQL) | ||
| if: steps.check.outcome == 'failure' | ||
| run: | | ||
| ./scripts/python_tests.sh | ||
| - name: Upload code coverage | ||
| if: steps.check.outcome == 'failure' | ||
| run: | | ||
| bash .github/workflows/codecov.sh -c -F python -F postgres | ||
| test-sqlite: | ||
| if: github.event.pull_request.draft == false | ||
| runs-on: ubuntu-20.04 | ||
| strategy: | ||
| matrix: | ||
| python-version: [3.7] | ||
| env: | ||
| PYTHONPATH: ${{ github.workspace }} | ||
| SUPERSET_CONFIG: tests.integration_tests.superset_test_config | ||
| REDIS_PORT: 16379 | ||
| SUPERSET__SQLALCHEMY_DATABASE_URI: | | ||
| sqlite:///${{ github.workspace }}/.temp/unittest.db | ||
| services: | ||
| redis: | ||
| image: redis:5-alpine | ||
| ports: | ||
| - 16379:6379 | ||
| steps: | ||
| - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )" | ||
| uses: actions/checkout@v2 | ||
| with: | ||
| persist-credentials: false | ||
| submodules: recursive | ||
| - name: Check if python changes are present | ||
| id: check | ||
| env: | ||
| GITHUB_REPO: ${{ github.repository }} | ||
| PR_NUMBER: ${{ github.event.pull_request.number }} | ||
| continue-on-error: true | ||
| run: ./scripts/ci_check_no_file_changes.sh python | ||
| - name: Setup Python | ||
| if: steps.check.outcome == 'failure' | ||
| uses: actions/setup-python@v2 | ||
| with: | ||
| python-version: ${{ matrix.python-version }} | ||
| - name: Install dependencies | ||
| if: steps.check.outcome == 'failure' | ||
| uses: ./.github/actions/cached-dependencies | ||
| with: | ||
| run: | | ||
| apt-get-install | ||
| pip-upgrade | ||
| pip install -r requirements/testing.txt | ||
| mkdir ${{ github.workspace }}/.temp | ||
| - name: Run celery | ||
| if: steps.check.outcome == 'failure' | ||
| run: celery --app=superset.tasks.celery_app:app worker -Ofair -c 2 & | ||
| - name: Python integration tests (SQLite) | ||
| if: steps.check.outcome == 'failure' | ||
| run: | | ||
| ./scripts/python_tests.sh | ||
| - name: Upload code coverage | ||
| if: steps.check.outcome == 'failure' | ||
| run: | | ||
| bash .github/workflows/codecov.sh -c -F python -F sqlite |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.