Skip to content

Commit 00b3cb7

Browse files
authored
Merge pull request #647 from dbt-msft/fix/devcontainer-version
fix: (dev) container version upgrade, uv initial and small bugfixes
2 parents 3940f81 + a8fe81d commit 00b3cb7

6 files changed

Lines changed: 24 additions & 7 deletions

File tree

.devcontainer/devcontainer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"name": "Python 3",
3-
"image": "mcr.microsoft.com/devcontainers/python:1-3.10-bookworm",
3+
"image": "mcr.microsoft.com/devcontainers/python:3.10-bookworm",
44
"features": {
5-
"ghcr.io/devcontainers/features/docker-in-docker:2.12.0": {}
5+
"ghcr.io/devcontainers/features/docker-in-docker:2.17.0": {}
66
},
77
"forwardPorts": [1433],
88
"postStartCommand": "/bin/bash ./.devcontainer/setup_odbc.sh & /bin/bash ./.devcontainer/setup_env.sh",

.devcontainer/setup_env.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,12 @@ cp test.env.sample test.env
33
docker compose build
44
docker compose up -d
55

6-
pip install -r dev_requirements.txt
6+
# Install uv in system Python
7+
pip install uv
8+
9+
# Use uv to install dependencies in system Python
10+
uv pip install --system -r dev_requirements.txt
11+
12+
# Install pre-commit hooks
13+
uv pip install --system pre-commit
14+
pre-commit install

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,11 @@ jobs:
3838
steps:
3939
- uses: actions/checkout@v4
4040

41+
- name: Install uv
42+
run: pip install uv
43+
4144
- name: Install dependencies
42-
run: pip install -r dev_requirements.txt
45+
run: uv pip install --system -r dev_requirements.txt
4346

4447
- name: Run functional tests
4548
run: pytest -ra -v tests/functional --profile "ci_sql_server"

.github/workflows/release-version.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,11 @@ jobs:
1717
with:
1818
python-version: '3.9'
1919

20+
- name: Install uv
21+
run: pip install uv
22+
2023
- name: Install dependencies
21-
run: pip install -r dev_requirements.txt
24+
run: uv pip install --system -r dev_requirements.txt
2225

2326
- name: Verify version match
2427
run: python setup.py verify

.github/workflows/unit-tests.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,11 @@ jobs:
3232

3333
- uses: actions/checkout@v4
3434

35+
- name: Install uv
36+
run: pip install uv
37+
3538
- name: Install dependencies
36-
run: pip install -r dev_requirements.txt
39+
run: uv pip install --system -r dev_requirements.txt
3740

3841
- name: Run unit tests
3942
run: pytest -n auto -ra -v tests/unit

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ THREADS ?= auto
44
.PHONY: dev
55
dev: ## Installs adapter in develop mode along with development dependencies
66
@\
7-
pip install -r dev_requirements.txt && pre-commit install
7+
uv pip install -r dev_requirements.txt && pre-commit install
88

99
.PHONY: mypy
1010
mypy: ## Runs mypy against staged changes for static type checking.

0 commit comments

Comments
 (0)