Skip to content

Commit 5585cb6

Browse files
committed
Merge branch 'master' into python312
2 parents 73e5eea + ec30afe commit 5585cb6

File tree

110 files changed

+5030
-1992
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+5030
-1992
lines changed

.devcontainer/devcontainer-lock.json

Lines changed: 0 additions & 9 deletions
This file was deleted.

.devcontainer/devcontainer.json

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,22 @@
11
{
2-
"name": "Python 3",
3-
"image": "mcr.microsoft.com/devcontainers/python:1-3.10-bookworm",
4-
"features": {
5-
"ghcr.io/devcontainers/features/docker-in-docker:2": {}
6-
},
7-
"postStartCommand": "bash .devcontainer/setup_odbc.sh && bash .devcontainer/install_pyenv.sh && bash .devcontainer/setup_env.sh",
8-
"runArgs": [
9-
"--env-file", "${localWorkspaceFolder}/.devcontainer/test.env"
10-
]
2+
"name": "Python 3",
3+
"image": "mcr.microsoft.com/devcontainers/python:1-3.10-bookworm",
4+
"features": {
5+
"ghcr.io/devcontainers/features/docker-in-docker:2.12.0": {}
6+
},
7+
"forwardPorts": [1433],
8+
"postStartCommand": "/bin/bash ./.devcontainer/setup_odbc.sh & /bin/bash ./.devcontainer/setup_env.sh",
9+
"containerEnv": {
10+
"SQLSERVER_TEST_DRIVER": "ODBC Driver 18 for SQL Server",
11+
"SQLSERVER_TEST_HOST": "127.0.0.1",
12+
"SQLSERVER_TEST_USER": "SA",
13+
"SQLSERVER_TEST_PASS": "L0calTesting!",
14+
"SQLSERVER_TEST_PORT": "1433",
15+
"SQLSERVER_TEST_DBNAME": "TestDB",
16+
"SQLSERVER_TEST_ENCRYPT": "true",
17+
"SQLSERVER_TEST_TRUST_CERT": "true",
18+
"DBT_TEST_USER_1": "DBT_TEST_USER_1",
19+
"DBT_TEST_USER_2": "DBT_TEST_USER_2",
20+
"DBT_TEST_USER_3": "DBT_TEST_USER_3"
21+
}
1122
}

.devcontainer/setup_env.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
pyenv install 3.10.7
2-
pyenv virtualenv 3.10.7 dbt-sqlserver
3-
pyenv activate dbt-sqlserver
1+
cp test.env.sample test.env
42

5-
make dev
6-
make server
3+
docker compose build
4+
docker compose up -d
5+
6+
pip install -r dev_requirements.txt

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.txt text eol=lf

.github/workflows/integration-tests-sqlserver.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ on: # yamllint disable-line rule:truthy
1010
branches:
1111
- master
1212
- v*
13+
schedule:
14+
- cron: '0 22 * * 0'
1315

1416
jobs:
1517
integration-tests-sql-server:

.github/workflows/publish-docker.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ jobs:
2020
packages: write
2121
steps:
2222
- name: Checkout
23-
uses: actions/checkout@v3
23+
uses: actions/checkout@v4
2424

2525
- name: Log in to the Container registry
26-
uses: docker/login-action@v2.1.0
26+
uses: docker/login-action@v3.3.0
2727
with:
2828
registry: ghcr.io
2929
username: ${{ github.actor }}
@@ -50,10 +50,10 @@ jobs:
5050
packages: write
5151
steps:
5252
- name: Checkout
53-
uses: actions/checkout@v3
53+
uses: actions/checkout@v4
5454

5555
- name: Log in to the Container registry
56-
uses: docker/login-action@v2.1.0
56+
uses: docker/login-action@v3.3.0
5757
with:
5858
registry: ghcr.io
5959
username: ${{ github.actor }}

.github/workflows/release-version.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ jobs:
1111
name: Release new version
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515

16-
- uses: actions/setup-python@v4
16+
- uses: actions/setup-python@v5
1717
with:
1818
python-version: '3.9'
1919

.github/workflows/unit-tests.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ on: # yamllint disable-line rule:truthy
1010
branches:
1111
- master
1212
- v*
13+
schedule:
14+
- cron: '0 22 * * 0'
1315

1416
jobs:
1517
unit-tests:
@@ -28,7 +30,7 @@ jobs:
2830
password: ${{ secrets.github_token }}
2931
steps:
3032

31-
- uses: actions/checkout@v3
33+
- uses: actions/checkout@v4
3234

3335
- name: Install dependencies
3436
run: pip install -r dev_requirements.txt

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,3 +96,5 @@ ENV/
9696
env.bak/
9797
venv.bak/
9898
.mise.toml
99+
100+
devcontainer-lock.json

.pre-commit-config.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ default_language_version:
22
python: python3.10
33
repos:
44
- repo: 'https://github.com/pre-commit/pre-commit-hooks'
5-
rev: v4.4.0
5+
rev: v4.6.0
66
hooks:
77
- id: check-yaml
88
args:
@@ -21,7 +21,7 @@ repos:
2121
- id: mixed-line-ending
2222
- id: check-docstring-first
2323
- repo: 'https://github.com/adrienverge/yamllint'
24-
rev: v1.32.0
24+
rev: v1.35.1
2525
hooks:
2626
- id: yamllint
2727
args:
@@ -32,13 +32,13 @@ repos:
3232
hooks:
3333
- id: absolufy-imports
3434
- repo: 'https://github.com/hadialqattan/pycln'
35-
rev: v2.1.3
35+
rev: v2.4.0
3636
hooks:
3737
- id: pycln
3838
args:
3939
- '--all'
4040
- repo: 'https://github.com/pycqa/isort'
41-
rev: 5.12.0
41+
rev: 5.13.2
4242
hooks:
4343
- id: isort
4444
args:
@@ -50,7 +50,7 @@ repos:
5050
- '--python-version'
5151
- '39'
5252
- repo: 'https://github.com/psf/black'
53-
rev: 23.3.0
53+
rev: 24.8.0
5454
hooks:
5555
- id: black
5656
args:
@@ -66,7 +66,7 @@ repos:
6666
- '--check'
6767
- '--diff'
6868
- repo: 'https://github.com/pycqa/flake8'
69-
rev: 6.0.0
69+
rev: 7.1.1
7070
hooks:
7171
- id: flake8
7272
args:
@@ -78,7 +78,7 @@ repos:
7878
stages:
7979
- manual
8080
- repo: 'https://github.com/pre-commit/mirrors-mypy'
81-
rev: v1.3.0
81+
rev: v1.11.1
8282
hooks:
8383
- id: mypy
8484
args:

0 commit comments

Comments
 (0)