Skip to content

Commit

Permalink
Build fixes (#213)
Browse files Browse the repository at this point in the history
* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* updated build version

* updated build version
  • Loading branch information
ronanstokes-db committed May 9, 2023
1 parent 80ca02b commit 250f92a
Show file tree
Hide file tree
Showing 12 changed files with 33 additions and 23 deletions.
13 changes: 8 additions & 5 deletions .github/workflows/onrelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,18 @@ jobs:
- name: Checkout
uses: actions/checkout@v2

- name: Unshallow
run: git fetch --prune --unshallow

- name: Set up Python 3.8
uses: actions/setup-python@v3
uses: actions/setup-python@v4
with:
python-version: '3.8'
python-version: '3.8.12'
cache: 'pipenv'

- name: Check Python version
run: python --version

- name: Install pip
run: python -m pip install --upgrade pip

- name: Install
run: pip install pipenv

Expand Down
19 changes: 12 additions & 7 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,13 @@ on:

jobs:
tests:
# Ubuntu latest no longer installs Python 3.8 by default so install it
# Ubuntu latest no longer installs Python 3.9 by default so install it
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Unshallow
run: git fetch --prune --unshallow
uses: actions/checkout@v3
with:
fetch-depth: 0

# - name: Cache packages
# uses: actions/cache@v2
Expand All @@ -29,11 +28,17 @@ jobs:
# ${{ runner.os }}-go-

- name: Set up Python 3.8
uses: actions/setup-python@v3
uses: actions/setup-python@v4
with:
python-version: '3.8'
python-version: '3.8.12'
cache: 'pipenv'

- name: Check Python version
run: python --version

- name: Install pip
run: python -m pip install --upgrade pip

- name: Install
run: pip install pipenv

Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ All notable changes to the Databricks Labs Data Generator will be documented in
#### Changed
* Added formatting of generated code as Html for script methods

### Version 0.3.4 Post 3

### Changed
* Build now uses Python 3.8.12. Updated build process to reflect that.

### Version 0.3.4 Post 2

Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ Dependent packages are not installed automatically by the `dbldatagen` package.

## Python compatibility

The code has been tested with Python 3.8.10 and later.
The code has been tested with Python 3.8.12 and later.

Older releases were tested with Python 3.7.5 but as of this release, it requires the Databricks runtime 9.1 LTS or later
which relies on Python 3.8.10
Older releases were tested with Python 3.7.5 but as of this release, it requires the Databricks
runtime 9.1 LTS or later.

## Checking your code for common issues

Expand Down
2 changes: 1 addition & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ pyparsing = "==2.4.7"
jmespath = "==0.10.0"

[requires]
python_version = ">=3.8.10"
python_version = "3.8.12"
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ details of use and many examples.

Release notes and details of the latest changes for this specific release
can be found in the GitHub repository
[here](https://github.com/databrickslabs/dbldatagen/blob/release/v0.3.4post2/CHANGELOG.md)
[here](https://github.com/databrickslabs/dbldatagen/blob/release/v0.3.4post3/CHANGELOG.md)

# Installation

Expand Down
2 changes: 1 addition & 1 deletion dbldatagen/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def get_version(version):
return version_info


__version__ = "0.3.4post2" # DO NOT EDIT THIS DIRECTLY! It is managed by bumpversion
__version__ = "0.3.4post3" # DO NOT EDIT THIS DIRECTLY! It is managed by bumpversion
__version_info__ = get_version(__version__)


Expand Down
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
author = 'Databricks Inc'

# The full version, including alpha/beta/rc tags
release = "0.3.4post2" # DO NOT EDIT THIS DIRECTLY! It is managed by bumpversion
release = "0.3.4post3" # DO NOT EDIT THIS DIRECTLY! It is managed by bumpversion


# -- General configuration ---------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion python/.bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.3.4post2
current_version = 0.3.4post3
commit = False
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+){0,1}(?P<release>\D*)(?P<build>\d*)
Expand Down
1 change: 0 additions & 1 deletion python/dev_require.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ pypandoc
ipython==7.22.0
recommonmark
sphinx-markdown-builder
rst2pdf==0.98
Jinja2 < 3.1
sphinx-copybutton

1 change: 0 additions & 1 deletion python/require.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ pypandoc
ipython==7.22.0
recommonmark
sphinx-markdown-builder
rst2pdf==0.98
Jinja2 < 3.1
sphinx-copybutton

2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

setuptools.setup(
name="dbldatagen",
version="0.3.4post2",
version="0.3.4post3",
author="Ronan Stokes, Databricks",
description="Databricks Labs - PySpark Synthetic Data Generator",
long_description=long_description,
Expand Down

0 comments on commit 250f92a

Please sign in to comment.