Skip to content

Commit 4f95b12

Browse files
authored
Merge branch 'master' into patch-1
2 parents 4a08b21 + 024e202 commit 4f95b12

File tree

134 files changed

+4651
-3346
lines changed

Some content is hidden

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

134 files changed

+4651
-3346
lines changed

.devcontainer/devcontainer-lock.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"features": {
3+
"ghcr.io/devcontainers/features/docker-in-docker:2": {
4+
"version": "2.7.1",
5+
"resolved": "ghcr.io/devcontainers/features/docker-in-docker@sha256:f6a73ee06601d703db7d95d03e415cab229e78df92bb5002e8559bcfc047fec6",
6+
"integrity": "sha256:f6a73ee06601d703db7d95d03e415cab229e78df92bb5002e8559bcfc047fec6"
7+
}
8+
}
9+
}

.devcontainer/devcontainer.json

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
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+
"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+
}
22+
}

.devcontainer/install_pyenv.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#/bin/bash
2+
curl https://pyenv.run | bash
3+
4+
echo 'export PYENV_ROOT="$HOME/.pyenv"
5+
[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"
6+
eval "$(pyenv init -)"' >> ~/.bashrc

.devcontainer/setup_env.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
cp test.env.sample test.env
2+
3+
docker compose build
4+
docker compose up -d
5+
6+
pip install -r dev_requirements.txt

.devcontainer/setup_odbc.sh

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
curl https://packages.microsoft.com/keys/microsoft.asc | sudo tee /etc/apt/trusted.gpg.d/microsoft.asc
2+
3+
#Download appropriate package for the OS version
4+
#Choose only ONE of the following, corresponding to your OS version
5+
6+
#Debian 12
7+
curl https://packages.microsoft.com/config/debian/12/prod.list | sudo tee /etc/apt/sources.list.d/mssql-release.list
8+
9+
sudo apt-get update
10+
sudo ACCEPT_EULA=Y apt-get install -y msodbcsql18
11+
# optional: for bcp and sqlcmd
12+
sudo ACCEPT_EULA=Y apt-get install -y mssql-tools18
13+
echo 'export PATH="$PATH:/opt/mssql-tools18/bin"' >> ~/.bashrc
14+
source ~/.bashrc
15+
# optional: for unixODBC development headers
16+
sudo apt-get install -y unixodbc-dev
17+
# optional: kerberos library for debian-slim distributions
18+
sudo apt-get install -y libgssapi-krb5-2

.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-azure.yml

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
python_version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
20+
python_version: ["3.8", "3.9", "3.10", "3.11"]
2121
msodbc_version: ["17", "18"]
2222
sqlserver_version: ["2017", "2019", "2022"]
2323
collation: ["SQL_Latin1_General_CP1_CS_AS", "SQL_Latin1_General_CP1_CI_AS"]
@@ -35,7 +35,7 @@ jobs:
3535
DBT_TEST_USER_3: DBT_TEST_USER_3
3636
COLLATION: ${{ matrix.collation }}
3737
steps:
38-
- uses: actions/checkout@v3
38+
- uses: actions/checkout@v4
3939

4040
- name: Install dependencies
4141
run: pip install -r dev_requirements.txt

.github/workflows/publish-docker.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ 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
2626
uses: docker/[email protected]
@@ -50,7 +50,7 @@ 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
5656
uses: docker/[email protected]

.github/workflows/release-version.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
name: Release new version
33

44
on: # yamllint disable-line rule:truthy
5-
push:
6-
tags:
7-
- 'v*'
5+
release:
6+
types:
7+
- published
88

99
jobs:
1010
release-version:
1111
name: Release new version
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515

1616
- uses: actions/setup-python@v4
1717
with:

0 commit comments

Comments
 (0)