Skip to content

Commit 8f9e7f8

Browse files
committed
revert
1 parent 854712a commit 8f9e7f8

File tree

10 files changed

+7
-1412
lines changed

10 files changed

+7
-1412
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ jobs:
1414
test:
1515
strategy:
1616
fail-fast: false
17-
matrix:
18-
dep-type:
19-
- latest
20-
- frozen
2117
runs-on: ${{ inputs.os }}
2218
steps:
2319
- name: Checkout
@@ -31,16 +27,9 @@ jobs:
3127
python-version: ${{ inputs.pyVersion }}
3228

3329
- name: Run tests
34-
shell: bash
35-
run: |
36-
if [ "${{ matrix.dep-type }}" = "latest" ]; then
37-
make dev-latest test
38-
else
39-
make dev test
40-
fi
30+
run: make dev install test
4131

4232
- name: Publish test coverage
43-
if: ${{ matrix.dep-type == 'frozen' }}
4433
uses: codecov/codecov-action@v4
4534
env:
4635
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.gitignore

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.venv*
1+
.venv
22
*.
33
build
44
dist
@@ -10,5 +10,4 @@ __pycache__
1010
databricks-sdk-py.iml
1111
.databricks
1212
.coverage
13-
htmlcov
14-
.python-version
13+
htmlcov

MANIFEST.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ exclude NEXT_CHANGELOG.md
1616
exclude tagging.py
1717
exclude .package.json
1818
exclude .release_metadata.json
19-
exclude requirements-dev-*.txt
2019

2120
recursive-exclude docs *
2221
recursive-exclude examples *

Makefile

Lines changed: 4 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,12 @@
1-
# Detect Python version from the system
2-
PYTHON_VERSION := $(shell python3 -c 'import sys; print(f"{sys.version_info.major}{sys.version_info.minor}")')
3-
4-
# Generate requirements filename based on Python version
5-
REQUIREMENTS_FILE = requirements-dev-py$(PYTHON_VERSION).txt
6-
7-
# Testing workflow:
8-
# 1. GitHub Actions runs tests for each Python version (3.8-3.12) on multiple OSes
9-
# 2. For each Python version, tests run in two modes:
10-
# - 'latest': Uses dependencies directly from pyproject.toml
11-
# - 'frozen': Uses version-specific requirements-dev-pyXY.txt
12-
# 3. Each Python version gets its own virtual environment (.venvXY)
13-
# 4. Tests are only blocking in `frozen` mode. Tests run in `latest` mode are
14-
# allowed to fail and serve as a warning that there may have been a breaking
15-
# change in a dependency.
16-
# 5. To run tests locally:
17-
# - make dev test # uses frozen dependencies
18-
# - make dev-latest test # uses latest dependencies
19-
#
20-
# To update dependencies for all Python versions using pyenv:
21-
# rm -rf .venv* requirements-dev-py*.txt
22-
# for v in 3.8 3.9 3.10 3.11 3.12 3.13; do
23-
# pyenv local $v
24-
# make dev-env update-dev-dep-lockfile
25-
# done
26-
27-
dev-env:
28-
python -m venv .venv$(PYTHON_VERSION)
1+
dev:
2+
python3 -m venv .venv
293
ifeq ($(OS), Windows_NT)
30-
.venv$(PYTHON_VERSION)\Scripts\activate
4+
.venv\Scripts\activate
315
else
32-
. .venv$(PYTHON_VERSION)/bin/activate
6+
. .venv/bin/activate
337
endif
34-
35-
dev: dev-env
36-
# Install all dependencies from the version-specific requirements file
37-
# Regenerate this file with `make update-dev-dep-lockfile PYTHON_VERSION=X.Y`
38-
pip install -r $(REQUIREMENTS_FILE)
39-
40-
dev-latest: dev-env
41-
# Install all dependencies from the pyproject.toml file
428
pip install '.[dev]'
439

44-
install-pip-tools:
45-
pip install pip-tools
46-
47-
update-dev-dep-lockfile: install-pip-tools
48-
pip-compile pyproject.toml --extra dev --output-file $(REQUIREMENTS_FILE)
49-
5010
install:
5111
pip install .
5212

requirements-dev-py310.txt

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

0 commit comments

Comments
 (0)