Skip to content

Commit 883ac96

Browse files
committed
Merge remote-tracking branch 'refs/remotes/origin/master' into feature_textdata_changes
2 parents 6168101 + ba2e87f commit 883ac96

Some content is hidden

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

59 files changed

+2701
-2943
lines changed

.github/dependabot.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "pip"
4+
directory: "/"
5+
schedule:
6+
interval: "daily"
7+
- package-ecosystem: "github-actions"
8+
directory: "/"
9+
schedule:
10+
interval: "daily"

.github/workflows/push.yml

Lines changed: 34 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,24 @@ on:
77
branches: [master]
88

99
jobs:
10+
fmt:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Checkout
14+
uses: actions/[email protected]
15+
16+
- name: Format files
17+
run: make dev fmt
18+
19+
- name: Fail on differences
20+
run: git diff --exit-code
21+
1022
tests:
1123
# Ubuntu latest no longer installs Python 3.9 by default so install it
12-
runs-on: ubuntu-22.04
24+
runs-on: ubuntu-latest
1325
steps:
1426
- name: Checkout
15-
uses: actions/checkout@v4
27+
uses: actions/checkout@v4.2.2
1628
with:
1729
fetch-depth: 0
1830

@@ -26,35 +38,33 @@ jobs:
2638
# key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
2739
# restore-keys: |
2840
# ${{ runner.os }}-go-
29-
- name: Set Java 8
30-
run: |
31-
sudo update-alternatives --set java /usr/lib/jvm/temurin-8-jdk-amd64/bin/java
32-
java -version
3341

34-
- name: Set up Python 3.8
35-
uses: actions/setup-python@v5
42+
- name: Set up JDK 17
43+
uses: actions/setup-java@v4
3644
with:
37-
python-version: '3.8.12'
38-
cache: 'pipenv'
39-
40-
- name: Check Python version
41-
run: python --version
45+
distribution: 'temurin' # Can also use 'zulu', 'adopt', etc.
46+
java-version: '17'
4247

43-
- name: Install pip
44-
run: python -m pip install --upgrade pip
48+
- name: Get Java version
49+
run: java -version
4550

46-
- name: Install
47-
run: pip install pipenv
51+
#- name: Set Java 8
52+
# run: |
53+
# sudo update-alternatives --set java /usr/lib/jvm/temurin-8-jdk-amd64/bin/java
54+
# java -version
4855

49-
- name: Install dependencies
50-
run: pipenv install --dev
56+
- name: Install Python
57+
uses: actions/setup-python@v5
58+
with:
59+
cache: 'pip'
60+
cache-dependency-path: '**/pyproject.toml'
61+
python-version: '3.10'
5162

52-
- name: Lint
53-
run: |
54-
pipenv run prospector --profile prospector.yaml
63+
- name: Install Hatch
64+
run: pip install hatch
5565

56-
- name: Run tests
57-
run: make test
66+
- name: Run unit tests
67+
run: make dev test
5868

5969
- name: Publish test coverage to coverage site
6070
uses: codecov/codecov-action@v4

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ jobs:
2424
sudo update-alternatives --set java /usr/lib/jvm/temurin-8-jdk-amd64/bin/java
2525
java -version
2626
27-
- name: Set up Python 3.8
27+
- name: Set up Python 3.10.12
2828
uses: actions/setup-python@v5
2929
with:
30-
python-version: '3.8.12'
30+
python-version: '3.10.12'
3131
cache: 'pipenv'
3232

3333
- name: Check Python version

.gitignore

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,15 @@ docs/source/reference/api/*.rst
3636
.coverage
3737
htmlcov/
3838
.coverage.xml
39+
40+
# IDE-specific folders — prevent local/editor config files from polluting source control.
41+
# PyCharm
42+
# JetBrains specific template is maintained in a separate JetBrains.gitignore that can
43+
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
44+
# and can be added to the global gitignore or merged into this file. For a more nuclear
45+
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
46+
.idea/
47+
# Cursor IDE
48+
# Cursor is an AI-powered code editor. The .cursor/ directory contains IDE-specific
49+
# settings and configurations similar to other IDEs.
50+
.cursor/

CHANGELOG.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,23 @@ All notable changes to the Databricks Labs Data Generator will be documented in
77

88
#### Fixed
99
* Updated build scripts to use Ubuntu 22.04 to correspond to environment in Databricks runtime
10+
* Refactored `DataAnalyzer` and `BasicStockTickerProvider` to comply with ANSI SQL standards
11+
* Removed internal modification of `SparkSession`
12+
13+
#### Changed
14+
* Changed base Databricks runtime version to DBR 13.3 LTS (based on Apache Spark 3.4.1) - minimum supported version
15+
of Python is now 3.10.12
16+
* Updated build tooling to use [hatch](https://hatch.pypa.io/latest/)
17+
* Moved dependencies and tool configuration to [pyproject.toml](pyproject.toml)
18+
* Removed dependencies provided by the Databricks Runtime
19+
* Updated Git actions
20+
* Updated [makefile](makefile)
21+
* Updated [CONTRIBUTING.md](CONTRIBUTING.md)
22+
23+
#### Added
24+
* Added support for serialization to/from JSON format
25+
* Added Ruff and mypy tooling
26+
1027

1128
### Version 0.4.0 Hotfix 2
1229

0 commit comments

Comments
 (0)