Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build: migrate from pipenv to poetry #13

Merged
merged 61 commits into from
Jun 2, 2023
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
2580bd4
build(.python-version): change python version from 3.7 to 3.9
roberta-dt May 15, 2023
453bb9f
build(pyproject.toml): migrate from pipenv to poetry
roberta-dt May 15, 2023
432f7db
refactor(pyproject.toml): remove pyproject.toml from root of repo
roberta-dt May 16, 2023
bd5b471
refactor(pyproject.toml): rename to pipelines
roberta-dt May 16, 2023
751a6ea
refactor(pyproject.toml): update author and description
roberta-dt May 16, 2023
43817e5
build(cloudbuild-files): update the CI/CD pipelines in the cloudbuild…
roberta-dt May 16, 2023
0cfb1ed
refactor(cloudbuild): adjust python version
roberta-dt May 17, 2023
2f44007
build(cloudbuild): update python image from 3.7 to 3.9
roberta-dt May 17, 2023
fd40dd1
Merge branch 'develop' into feature/add-poetry
roberta-dt May 23, 2023
c960f13
refactor(pyproject.toml): change description
roberta-dt May 23, 2023
644660e
refactor(pyproject.toml): change description
roberta-dt May 23, 2023
be883a5
build(Makefile): change all pipenv commands to poetry commands
roberta-dt May 23, 2023
170a746
style(pyproject.toml): correct authors description to string type
roberta-dt May 23, 2023
5c3274f
build(Makefile): fix makefile setup instructions
roberta-dt May 23, 2023
9ede258
build(Makefile): fix pr-commit issue
roberta-dt May 23, 2023
7cf5b16
build(Makefile): fix pre-commit checks
roberta-dt May 23, 2023
68c6484
build(Makefile): fix pre-commit issue
roberta-dt May 23, 2023
b9faf75
build(.pre-commit-config.yaml): update from python 3.7 to 3.9
roberta-dt May 23, 2023
610bbd3
refactor(.pre-commit-config.yaml): fix pre-commit hooks
roberta-dt May 23, 2023
5bdad5a
refactor(.pre-commit-config.yaml): fix pre-commit
roberta-dt May 23, 2023
95d44f8
style(pyproject.toml): change author description to string format
roberta-dt May 23, 2023
352a4ed
build(pyproject.toml): update packages
roberta-dt May 25, 2023
68a290d
build(makefile): update makefile
roberta-dt May 25, 2023
cec9f3e
build(pyproject.toml): update poetry dependencies
roberta-dt May 26, 2023
149ab44
build(pyproject.toml): remove pytest from dependecies
roberta-dt May 26, 2023
341392a
docs(CONTRIBUTING.md): update docs with poetry requirements
roberta-dt May 26, 2023
1258220
docs(README.md): update poetry dependencies
roberta-dt May 26, 2023
08c3796
style(pr-checks.yaml): update comment with poetry dependency
roberta-dt May 26, 2023
7185dc6
style(pr-checks.yaml): update comments with poetry dependency
roberta-dt May 26, 2023
7aa2efc
style(release.yaml): update comments with poetry dependency
roberta-dt May 26, 2023
86fc921
style(README.md): update comments with poetry dependency
roberta-dt May 26, 2023
bcea327
style(README.md): update comments with poetry dependency
roberta-dt May 26, 2023
9bf426c
style(README.md): update comments with how to install new component p…
roberta-dt May 26, 2023
67abb5e
style(CONTRIBUTING.md): update docs with poetry requirements
roberta-dt May 26, 2023
6a7b6d9
style(README.md): update comments with how to install new component p…
roberta-dt May 26, 2023
94cd885
style(README.md): update comments to reflect poetry package installation
roberta-dt May 26, 2023
05378d9
style(README.md): update with poetry requirements
roberta-dt May 26, 2023
736392c
build(poetry.lock): update poetry.lock file
roberta-dt May 26, 2023
369d99d
style(README.md): update with poetry requirements
roberta-dt May 26, 2023
d6afa10
build(src): update the base images of components to python 3.9
roberta-dt May 30, 2023
28251c6
build(.python-version): change python version from 3.9 to 3.7
roberta-dt May 30, 2023
358abc2
build(.python-vesrion): python 3.7 to 3.9
roberta-dt May 30, 2023
98ba6db
refactor(pyproject.toml): rebase
roberta-dt May 30, 2023
386349d
style(README.md): add instructions for python version detection
roberta-dt May 30, 2023
ee462f0
style(Makefile): remove pip install poetry from setup command
roberta-dt May 30, 2023
7d18fa8
build: revert python version from 3.9 to 3.7
roberta-dt May 30, 2023
db68bec
Merge branch 'develop' into feature/add-poetry
roberta-dt May 30, 2023
fc13174
style(Makefile): fix Makefile
roberta-dt May 30, 2023
ee5bb52
style(pyproject.toml): change description
roberta-dt May 30, 2023
43463f8
style(pyproject.toml): change description
roberta-dt May 30, 2023
bf2fa78
docs(README.md): update docs
roberta-dt May 30, 2023
e39dc49
docs(CONTRIBUTING.md): update docs
roberta-dt May 30, 2023
4adc66e
style(pyproject.toml): change description
roberta-dt May 30, 2023
ebcc591
style(.python-version): fix python version
roberta-dt May 30, 2023
3a694cd
style(Makefile): update makefile
roberta-dt May 30, 2023
db7fe79
Update components/README.md
felix-datatonic Jun 2, 2023
f5a5572
Update components/README.md
felix-datatonic Jun 2, 2023
8df3413
Update components/bigquery-components/.python-version
felix-datatonic Jun 2, 2023
ee5c1aa
Cleanup
felix-datatonic Jun 2, 2023
874d282
build(pyproject.toml): add coverage package
roberta-dt Jun 2, 2023
c465a0b
Merge remote-tracking branch 'refs/remotes/origin/feature/add-poetry'…
roberta-dt Jun 2, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .python-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.7.12
3.9.16
2 changes: 1 addition & 1 deletion cloudbuild/e2e-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ steps:

# Install Python deps
# Run end-to-end (E2E) pipeline tests on both pipelines
- name: python:3.7
- name: python:3.9
entrypoint: /bin/sh
args:
- -c
Expand Down
2 changes: 1 addition & 1 deletion cloudbuild/pr-checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ steps:
# Install pipenv and deps, run pre-commit and unit tests
# Then compile pipelines (to make sure they can compile)
# need to run "git init" for pre-commit checks to work
- name: python:3.7
- name: python:3.9
entrypoint: /bin/sh
args:
- -c
Expand Down
2 changes: 1 addition & 1 deletion cloudbuild/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
steps:

# Install pipenv, install deps, compile pipelines
- name: python:3.7
- name: python:3.9
entrypoint: /bin/sh
args:
- -c
Expand Down
2 changes: 1 addition & 1 deletion cloudbuild/trigger-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.
---
steps:
- name: 'python:3.7'
- name: 'python:3.9'
args:
- '-c'
- |
Expand Down
2 changes: 1 addition & 1 deletion components/bigquery-components/.python-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.7.12
3.9.16
14 changes: 0 additions & 14 deletions components/bigquery-components/Pipfile

This file was deleted.

1,220 changes: 0 additions & 1,220 deletions components/bigquery-components/Pipfile.lock

This file was deleted.

1,772 changes: 1,772 additions & 0 deletions components/bigquery-components/poetry.lock

Large diffs are not rendered by default.

32 changes: 17 additions & 15 deletions components/bigquery-components/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,30 +1,32 @@
[project]
[tool.poetry]
name = "bigquery-components"
version = "0.1.0"
authors = [
{name = "Example User", email = "[email protected]"},
]
description = "BigQuery components"
description = "Bigquery components for vertex pipelines"
felix-datatonic marked this conversation as resolved.
Show resolved Hide resolved
readme = "README.md"
classifiers = [
"Development Status :: 3 - Alpha",
"Intended Audience :: Developers",
"Programming Language :: Python :: 3.7",
]
requires-python = ">=3.7"
dynamic = ["version"]
dependencies = [
"kfp == 1.8.21",
"Programming Language :: Python :: 3.9",
]

[project.optional-dependencies]
tests = [
"google-cloud-bigquery == 2.30.0",
"pytest >= 7.3.1,<8.0.0",
]
[tool.poetry.dependencies]
python = ">=3.9,<3.11"
Jinja2 = ">=3.0.1,<4.0.0"
google-cloud-aiplatform = "1.24.1"
google-cloud-pipeline-components = "1.0.42"
google-cloud-bigquery = "2.30.0"
kfp = "==1.8.21"

[tool.poetry.group.dev.dependencies]
pytest = ">=7.3.1,<8.0.0"
pre-commit = ">=2.14.1,<3.0.0"
This conversation was marked as resolved.
Show resolved Hide resolved

[build-system]
requires = ["setuptools", "wheel"]
build-backend = "setuptools.build_meta:__legacy__"
requires = ["poetry-core>=1.0.0"]
build-backend = "poetry.core.masonry.api"

[tool.flake8]
max-line-length = 88
Expand Down
2 changes: 1 addition & 1 deletion components/vertex-components/.python-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.7.12
3.9.16
16 changes: 0 additions & 16 deletions components/vertex-components/Pipfile

This file was deleted.

1,792 changes: 0 additions & 1,792 deletions components/vertex-components/Pipfile.lock

This file was deleted.

1,695 changes: 1,695 additions & 0 deletions components/vertex-components/poetry.lock

Large diffs are not rendered by default.

33 changes: 16 additions & 17 deletions components/vertex-components/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,32 +1,30 @@
[project]
[tool.poetry]
name = "vertex-components"
version = "0.1.0"
authors = [
{name = "Example User", email = "[email protected]"},
]
description = "Vertex AI components"
description = "Vertex components for training and prediction using the Chicago Taxi Dataset"
roberta-dt marked this conversation as resolved.
Show resolved Hide resolved
readme = "README.md"
classifiers = [
"Development Status :: 3 - Alpha",
"Intended Audience :: Developers",
"Programming Language :: Python :: 3.7",
]
requires-python = ">=3.7"
dynamic = ["version"]
dependencies = [
"kfp == 1.8.21",
"Programming Language :: Python :: 3.9",
]

[project.optional-dependencies]
tests = [
"google-cloud-aiplatform == 1.24.1",
"google-cloud-pipeline-components == 1.0.42",
"pytest >= 7.3.1,<8.0.0",
"pre-commit >= 2.14.1,<3.0.0",
]
[tool.poetry.dependencies]
python = ">=3.9,<3.11"
google-cloud-aiplatform = "1.24.1"
google-cloud-pipeline-components = "1.0.42"
kfp = "==1.8.21"

[tool.poetry.group.dev.dependencies]
pytest = ">=7.3.1,<8.0.0"
pre-commit = ">=2.14.1,<3.0.0"
This conversation was marked as resolved.
Show resolved Hide resolved

[build-system]
requires = ["setuptools", "wheel"]
build-backend = "setuptools.build_meta:__legacy__"
requires = ["poetry-core>=1.0.0"]
build-backend = "poetry.core.masonry.api"

[tool.flake8]
max-line-length = 88
Expand All @@ -45,3 +43,4 @@ pythonpath = [
]
testpaths = "tests"
junit_family = "xunit2"

2 changes: 1 addition & 1 deletion pipelines/.python-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.7.12
3.9.16
19 changes: 0 additions & 19 deletions pipelines/Pipfile

This file was deleted.

Loading