Skip to content

Commit

Permalink
Merge branch 'dev/kiyoshi-kuromiya' into fix-bug-2731
Browse files Browse the repository at this point in the history
  • Loading branch information
rvacaru authored Dec 23, 2020
2 parents 6e29327 + c5c780a commit 7fb771b
Show file tree
Hide file tree
Showing 862 changed files with 65,932 additions and 21,642 deletions.
10 changes: 9 additions & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.14.1
current_version = 0.19.0b1
parse = (?P<major>\d+)
\.(?P<minor>\d+)
\.(?P<patch>\d+)
Expand Down Expand Up @@ -34,3 +34,11 @@ first_value = 1

[bumpversion:file:plugins/bigquery/setup.py]

[bumpversion:file:plugins/postgres/dbt/adapters/postgres/__version__.py]

[bumpversion:file:plugins/redshift/dbt/adapters/redshift/__version__.py]

[bumpversion:file:plugins/snowflake/dbt/adapters/snowflake/__version__.py]

[bumpversion:file:plugins/bigquery/dbt/adapters/bigquery/__version__.py]

149 changes: 119 additions & 30 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,38 @@
version: 2
version: 2.1
jobs:
unit:
docker: &test_only
- image: fishtownanalytics/test-container:9
environment:
DBT_INVOCATION_ENV: circle
steps:
- checkout
- run: tox -e flake8,mypy,unit-py36,unit-py38
build-wheels:
docker: *test_only
steps:
- checkout
- run:
name: Build wheels
command: |
python3.8 -m venv "${PYTHON_ENV}"
export PYTHON_BIN="${PYTHON_ENV}/bin/python"
$PYTHON_BIN -m pip install -U pip setuptools
$PYTHON_BIN -m pip install -r requirements.txt
$PYTHON_BIN -m pip install -r dev_requirements.txt
/bin/bash ./scripts/build-wheels.sh
$PYTHON_BIN ./scripts/collect-dbt-contexts.py > ./dist/context_metadata.json
$PYTHON_BIN ./scripts/collect-artifact-schema.py > ./dist/artifact_schemas.json
environment:
PYTHON_ENV: /home/tox/build_venv/
- store_artifacts:
path: ./dist
destination: dist
integration-postgres-py36:
docker: &test_and_postgres
- image: fishtownjacob/test-container
- image: fishtownanalytics/test-container:9
environment:
DBT_INVOCATION_ENV: circle
- image: postgres
name: database
environment: &pgenv
Expand All @@ -19,20 +49,13 @@ jobs:
PGUSER: root
PGPASSWORD: password
PGDATABASE: postgres
- run: tox -e flake8,unit-py27,unit-py36
integration-postgres-py36:
docker: *test_and_postgres
steps:
- checkout
- run: *setupdb
- run:
name: Run tests
command: tox -e integration-postgres-py36
- store_artifacts:
path: ./logs
integration-snowflake-py36:
docker: &test_only
- image: fishtownjacob/test-container
docker: *test_only
steps:
- checkout
- run:
Expand All @@ -59,42 +82,81 @@ jobs:
command: tox -e integration-bigquery-py36
- store_artifacts:
path: ./logs
integration-postgres-py27:
integration-postgres-py38:
docker: *test_and_postgres
steps:
- checkout
- run: *setupdb
- run:
name: Run tests
command: tox -e integration-postgres-py27
command: tox -e integration-postgres-py38
- store_artifacts:
path: ./logs
integration-snowflake-py27:
integration-snowflake-py38:
docker: *test_only
steps:
- checkout
- run:
name: Run tests
command: tox -e integration-snowflake-py27
command: tox -e integration-snowflake-py38
no_output_timeout: 1h
- store_artifacts:
path: ./logs
integration-redshift-py27:
integration-redshift-py38:
docker: *test_only
steps:
- checkout
- run:
name: Run tests
command: tox -e integration-redshift-py27
command: tox -e integration-redshift-py38
- store_artifacts:
path: ./logs
integration-bigquery-py27:
integration-bigquery-py38:
docker: *test_only
steps:
- checkout
- run:
name: Run tests
command: tox -e integration-bigquery-py27
command: tox -e integration-bigquery-py38
- store_artifacts:
path: ./logs

integration-postgres-py39:
docker: *test_and_postgres
steps:
- checkout
- run: *setupdb
- run:
name: Run tests
command: tox -e integration-postgres-py39
- store_artifacts:
path: ./logs
integration-snowflake-py39:
docker: *test_only
steps:
- checkout
- run:
name: Run tests
command: tox -e integration-snowflake-py39
no_output_timeout: 1h
- store_artifacts:
path: ./logs
integration-redshift-py39:
docker: *test_only
steps:
- checkout
- run:
name: Run tests
command: tox -e integration-redshift-py39
- store_artifacts:
path: ./logs
integration-bigquery-py39:
docker: *test_only
steps:
- checkout
- run:
name: Run tests
command: tox -e integration-bigquery-py39
- store_artifacts:
path: ./logs

Expand All @@ -106,18 +168,6 @@ workflows:
- integration-postgres-py36:
requires:
- unit
- integration-postgres-py27:
requires:
- unit
- integration-redshift-py27:
requires:
- integration-postgres-py27
- integration-bigquery-py27:
requires:
- integration-postgres-py27
- integration-snowflake-py27:
requires:
- integration-postgres-py27
- integration-redshift-py36:
requires:
- integration-postgres-py36
Expand All @@ -127,3 +177,42 @@ workflows:
- integration-snowflake-py36:
requires:
- integration-postgres-py36
- integration-postgres-py38:
requires:
- unit
- integration-redshift-py38:
requires:
- integration-postgres-py38
- integration-bigquery-py38:
requires:
- integration-postgres-py38
- integration-snowflake-py38:
requires:
- integration-postgres-py38
- integration-postgres-py39:
requires:
- unit
- integration-redshift-py39:
requires:
- integration-postgres-py39
- integration-bigquery-py39:
requires:
- integration-postgres-py39
# - integration-snowflake-py39:
# requires:
# - integration-postgres-py39
- build-wheels:
requires:
- unit
- integration-postgres-py36
- integration-redshift-py36
- integration-bigquery-py36
- integration-snowflake-py36
- integration-postgres-py38
- integration-redshift-py38
- integration-bigquery-py38
- integration-snowflake-py38
- integration-postgres-py39
- integration-redshift-py39
- integration-bigquery-py39
# - integration-snowflake-py39
2 changes: 2 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
*
!docker/requirements/*.txt
!dist
3 changes: 3 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,6 @@ Is this feature database-specific? Which database(s) is/are relevant? Please inc

### Who will this benefit?
What kind of use case will this feature be useful for? Please be specific and provide examples, this will help us prioritize properly.

### Are you interested in contributing this feature?
Let us know if you want to write some code, and how we can help.
22 changes: 22 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
resolves #

<!---
Include the number of the issue addressed by this PR above if applicable.
PRs for code changes without an associated issue *will not be merged*.
See CONTRIBUTING.md for more information.
Example:
resolves #1234
-->


### Description

<!--- Describe the Pull Request here -->


### Checklist
- [ ] I have signed the [CLA](https://docs.getdbt.com/docs/contributor-license-agreements)
- [ ] I have run this code in development and it appears to resolve the stated issue
- [ ] This PR includes tests, or tests are not required/relevant for this PR
- [ ] I have updated the `CHANGELOG.md` and added information about my change to the "dbt next" section.
20 changes: 17 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ __pycache__/

# Distribution / packaging
.Python
env/
env*/
dbt_env/
build/
develop-eggs/
dist/
Expand All @@ -23,6 +24,7 @@ var/
*.egg-info/
.installed.cfg
*.egg
*.mypy_cache/
logs/

# PyInstaller
Expand All @@ -41,12 +43,16 @@ htmlcov/
.coverage
.coverage.*
.cache
.env
nosetests.xml
coverage.xml
*,cover
.hypothesis/
test.env

# Mypy
.mypy_cache/

# Translations
*.mo
*.pot
Expand Down Expand Up @@ -77,5 +83,13 @@ target/
# Vim
*.sw*

# Intellij Idea
.idea
# pycharm
.idea/

# AWS credentials
.aws/

.DS_Store

# vscode
.vscode/
Loading

0 comments on commit 7fb771b

Please sign in to comment.