Skip to content

Commit af1cfec

Browse files
committed
Merge remote-tracking branch 'refs/remotes/origin/master' into build_tools
# Conflicts: # .github/workflows/push.yml # CONTRIBUTING.md # Pipfile # makefile # setup.py
2 parents 9e898ab + 2beb541 commit af1cfec

File tree

5 files changed

+30
-26
lines changed

5 files changed

+30
-26
lines changed

.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.9.21
27+
- name: Set up Python 3.10.12
2828
uses: actions/setup-python@v5
2929
with:
30-
python-version: '3.9.21'
30+
python-version: '3.10.12'
3131
cache: 'pipenv'
3232

3333
- name: Check Python version

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ All notable changes to the Databricks Labs Data Generator will be documented in
99
* Updated build scripts to use Ubuntu 22.04 to correspond to environment in Databricks runtime
1010

1111
#### Changed
12-
* Changed base Databricks runtime version to DBR 11.3 LTS (based on Apache Spark 3.3.0)
12+
* Changed base Databricks runtime version to DBR 13.3 LTS (based on Apache Spark 3.4.1) - minimum supported version
13+
of Python is now 3.10.12
1314

1415
#### Added
1516
* Added support for serialization to/from JSON format

README.md

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,23 +83,26 @@ The documentation [installation notes](https://databrickslabs.github.io/dbldatag
8383
contains details of installation using alternative mechanisms.
8484

8585
## Compatibility
86-
The Databricks Labs Data Generator framework can be used with Pyspark 3.3.0 and Python 3.9.21 or later. These are
87-
compatible with the Databricks runtime 11.3 LTS and later releases. For full Unity Catalog support,
88-
we recommend using Databricks runtime 13.2 or later (Databricks 13.3 LTS or above preferred)
86+
The Databricks Labs Data Generator framework can be used with Pyspark 3.4.1 and Python 3.10.12 or later. These are
87+
compatible with the Databricks runtime 13.3 LTS and later releases. This version also provides Unity Catalog
88+
compatibily.
8989

9090
For full library compatibility for a specific Databricks Spark release, see the Databricks
9191
release notes for library compatibility
9292

9393
- https://docs.databricks.com/release-notes/runtime/releases.html
9494

95-
When using the Databricks Labs Data Generator on "Unity Catalog" enabled Databricks environments,
95+
In older releases, when using the Databricks Labs Data Generator on "Unity Catalog" enabled Databricks environments,
9696
the Data Generator requires the use of `Single User` or `No Isolation Shared` access modes when using Databricks
9797
runtimes prior to release 13.2. This is because some needed features are not available in `Shared`
9898
mode (for example, use of 3rd party libraries, use of Python UDFs) in these releases.
99-
Depending on settings, the `Custom` access mode may be supported.
99+
Depending on settings, the `Custom` access mode may be supported for those releases.
100100

101101
The use of Unity Catalog `Shared` access mode is supported in Databricks runtimes from Databricks runtime release 13.2
102-
onwards.
102+
onwards.
103+
104+
*This version of the data generator uses the Databricks runtime 13.3 LTS as the minimum supported
105+
version and alleviates these issues.*
103106

104107
See the following documentation for more information:
105108

@@ -155,7 +158,7 @@ The GitHub repository also contains further examples in the examples directory.
155158

156159
## Spark and Databricks Runtime Compatibility
157160
The `dbldatagen` package is intended to be compatible with recent LTS versions of the Databricks runtime, including
158-
older LTS versions at least from 11.3 LTS and later. It also aims to be compatible with Delta Live Table runtimes,
161+
older LTS versions at least from 13.3 LTS and later. It also aims to be compatible with Delta Live Table runtimes,
159162
including `current` and `preview`.
160163

161164
While we don't specifically drop support for older runtimes, changes in Pyspark APIs or

python/dev_require.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
# The following packages are used in building the test data generator framework.
22
# All packages used are already installed in the Databricks runtime environment for version 6.5 or later
33
numpy==1.22.0
4-
pandas==1.3.4
4+
pandas==1.4.4
55
pickleshare==0.7.5
66
py4j>=0.10.9.3
7-
pyarrow==7.0.0
8-
pyspark==3.3.0
7+
pyarrow==8.0.0
8+
pyspark==3.4.1
99
python-dateutil==2.8.2
1010
six==1.16.0
11-
pyparsing==3.0.4
11+
pyparsing==3.0.9
1212
jmespath==0.10.0
1313

1414
# The following packages are required for development only
15-
wheel==0.37.0
16-
setuptools==58.0.4
15+
wheel==0.37.1
16+
setuptools==63.4.1
1717
bumpversion
1818
pytest
1919
pytest-cov
@@ -28,9 +28,9 @@ sphinx_rtd_theme
2828
nbsphinx
2929
numpydoc==0.8
3030
pypandoc
31-
ipython==7.32.0
31+
ipython==8.10.0
3232
recommonmark
3333
sphinx-markdown-builder
34-
Jinja2 < 3.1
34+
Jinja2 < 3.1, >= 2.11.3
3535
sphinx-copybutton
3636

python/require.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
# The following packages are used in building the test data generator framework.
22
# All packages used are already installed in the Databricks runtime environment for version 6.5 or later
33
numpy==1.22.0
4-
pandas==1.3.4
4+
pandas==1.4.4
55
pickleshare==0.7.5
66
py4j==0.10.9
7-
pyarrow==7.0.0
8-
pyspark==3.3.0
7+
pyarrow==8.0.0
8+
pyspark==3.4.1
99
python-dateutil==2.8.2
1010
six==1.16.0
11-
pyparsing==3.0.4
11+
pyparsing==3.0.9
1212
jmespath==0.10.0
1313

1414
# The following packages are required for development only
15-
wheel==0.37.0
16-
setuptools==58.0.4
15+
wheel==0.37.1
16+
setuptools==63.4.1
1717
bumpversion
1818
pytest
1919
pytest-cov
@@ -27,9 +27,9 @@ sphinx_rtd_theme
2727
nbsphinx
2828
numpydoc==0.8
2929
pypandoc
30-
ipython==7.32.0
30+
ipython==8.10.0
3131
recommonmark
3232
sphinx-markdown-builder
33-
Jinja2 < 3.1
33+
Jinja2 < 3.1, >= 2.11.3
3434
sphinx-copybutton
3535

0 commit comments

Comments
 (0)