Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into chore/remove-python…
Browse files Browse the repository at this point in the history
…-3.9
  • Loading branch information
felixscherz committed Oct 10, 2024
2 parents 4aa1d29 + 9f9c1c3 commit 6e359fa
Show file tree
Hide file tree
Showing 22 changed files with 49 additions and 38 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/kedro-airflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
strategy:
matrix:
os: [ ubuntu-latest, windows-latest ]
python-version: [ "3.8", "3.9", "3.10", "3.11", "3.12" ]
python-version: [ "3.9", "3.10", "3.11", "3.12" ]
uses: ./.github/workflows/unit-tests.yml
with:
plugin: kedro-airflow
Expand All @@ -40,7 +40,7 @@ jobs:
strategy:
matrix:
os: [ ubuntu-latest ]
python-version: [ "3.8", "3.9", "3.10", "3.11", "3.12" ]
python-version: [ "3.9", "3.10", "3.11", "3.12" ]
uses: ./.github/workflows/e2e-tests.yml
with:
plugin: kedro-airflow
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/kedro-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
strategy:
matrix:
os: [ ubuntu-latest, windows-latest ]
python-version: [ "3.8", "3.9", "3.10", "3.11", "3.12" ]
python-version: [ "3.9", "3.10", "3.11", "3.12" ]
uses: ./.github/workflows/unit-tests.yml
with:
plugin: kedro-docker
Expand All @@ -40,7 +40,7 @@ jobs:
strategy:
matrix:
os: [ ubuntu-latest ]
python-version: [ "3.8", "3.9", "3.10", "3.11", "3.12" ]
python-version: [ "3.9", "3.10", "3.11", "3.12" ]
uses: ./.github/workflows/e2e-tests.yml
with:
plugin: kedro-docker
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/kedro-telemetry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
strategy:
matrix:
os: [ ubuntu-latest ]
python-version: [ "3.8", "3.9", "3.10", "3.11", "3.12" ]
python-version: [ "3.9", "3.10", "3.11", "3.12" ]
uses: ./.github/workflows/unit-tests.yml
with:
plugin: kedro-telemetry
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ repos:
exclude: ^(?!kedro-airflow/kedro_airflow/).*\.py$
pass_filenames: false
stages: [ manual ]
entry: ruff kedro-airflow --fix --exit-non-zero-on-fix
entry: ruff check kedro-airflow --fix --exit-non-zero-on-fix

- id: ruff-kedro-docker
name: "Ruff on kedro_docker/*"
Expand All @@ -51,7 +51,7 @@ repos:
exclude: ^(?!kedro-docker/kedro_docker/).*\.py$
pass_filenames: false
stages: [ manual ]
entry: ruff kedro-docker --fix --exit-non-zero-on-fix
entry: ruff check kedro-docker --fix --exit-non-zero-on-fix

- id: ruff-kedro-telemetry
name: "Ruff on kedro_telemetry/*"
Expand All @@ -60,7 +60,7 @@ repos:
exclude: ^(?!kedro-telemetry/kedro_telemetry/).*\.py$
pass_filenames: false
stages: [manual]
entry: ruff kedro-telemetry --fix --exit-non-zero-on-fix
entry: ruff check kedro-telemetry --fix --exit-non-zero-on-fix

- id: black-kedro-datasets
name: "Black"
Expand Down
2 changes: 1 addition & 1 deletion kedro-airflow/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Kedro-Airflow

[![License](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
[![Python Version](https://img.shields.io/badge/python-3.8%20%7C%203.9%20%7C%203.10%20%7C%203.11%20%7C%203.12-blue.svg)](https://pypi.org/project/kedro-airflow/)
[![Python Version](https://img.shields.io/badge/python-3.9%20%7C%203.10%20%7C%203.11%20%7C%203.12-blue.svg)](https://pypi.org/project/kedro-airflow/)
[![PyPI Version](https://badge.fury.io/py/kedro-airflow.svg)](https://pypi.org/project/kedro-airflow/)
[![Code Style: Black](https://img.shields.io/badge/code%20style-black-black.svg)](https://github.com/ambv/black)

Expand Down
3 changes: 3 additions & 0 deletions kedro-airflow/RELEASE.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Upcoming Release

# Release 0.10.0
* Removed support for Python 3.8

# Release 0.9.1
* Added support to specify `--conf-source` which would point to the runtime configuration directory to be used for running the DAG in airflow. This configuration path is added to the generated DAG.

Expand Down
3 changes: 1 addition & 2 deletions kedro-airflow/features/steps/sh_run.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import shlex
import subprocess
from typing import Dict


def run(
cmd: str, split: bool = True, print_output: bool = False, **kwargs: Dict
cmd: str, split: bool = True, print_output: bool = False, **kwargs: dict
) -> int:
"""
Args:
Expand Down
2 changes: 1 addition & 1 deletion kedro-airflow/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ authors = [
{name = "Kedro"}
]
description = "Kedro-Airflow makes it easy to deploy Kedro projects to Airflow"
requires-python = ">=3.8"
requires-python = ">=3.9"
license = {text = "Apache Software License (Apache 2.0)"}
dependencies = [
"kedro>=0.19.0",
Expand Down
24 changes: 12 additions & 12 deletions kedro-datasets/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ dependencies = [
dynamic = ["readme", "version"]

[project.optional-dependencies]
pandas-base = ["pandas>=1.3, <3.0",]
spark-base = ["pyspark>=2.2, <4.0",]
hdfs-base = ["hdfs>=2.5.8, <3.0",]
s3fs-base = ["s3fs>=2021.04",]
polars-base = ["polars>=0.18.0",]
pandas-base = ["pandas>=1.3, <3.0"]
spark-base = ["pyspark>=2.2, <4.0"]
hdfs-base = ["hdfs>=2.5.8, <3.0"]
s3fs-base = ["s3fs>=2021.4"]
polars-base = ["polars>=0.18.0"]
plotly-base = ["plotly>=4.8.0, <6.0"]
delta-base = ["delta-spark>=1.0, <4.0",]
delta-base = ["delta-spark>=1.0, <4.0"]
networkx-base = ["networkx~=2.4"]

# Individual Datasets
Expand All @@ -43,7 +43,7 @@ databricks = ["kedro-datasets[databricks-managedtabledataset]"]
geopandas-geojsondataset = ["geopandas>=0.6.0, <1.0", "pyproj~=3.0"]
geopandas = ["kedro-datasets[geopandas-geojsondataset]"]

holoviews-holoviewswriter = ["holoviews~=1.13.0"]
holoviews-holoviewswriter = ["holoviews>=1.13.0"]
holoviews = ["kedro-datasets[holoviews-holoviewswriter]"]

huggingface-hfdataset = ["datasets", "huggingface_hub"]
Expand Down Expand Up @@ -118,7 +118,7 @@ pandas = [
pickle-pickledataset = ["compress-pickle[lz4]~=2.1.0"]
pickle = ["kedro-datasets[pickle-pickledataset]"]

pillow-imagedataset = ["Pillow~=9.0"]
pillow-imagedataset = ["Pillow>=9.0"]
pillow = ["kedro-datasets[pillow-imagedataset]"]

plotly-htmldataset = ["kedro-datasets[plotly-base]"]
Expand Down Expand Up @@ -154,10 +154,10 @@ spark = [
spark-sparkstreamingdataset]"""
]

svmlight-svmlightdataset = ["scikit-learn>=1.0.2", "scipy~=1.7.3"]
svmlight-svmlightdataset = ["scikit-learn>=1.0.2", "scipy>=1.7.3"]
svmlight = ["kedro-datasets[svmlight-svmlightdataset]"]

tensorflow-tensorflowmodeldataset = ["tensorflow~=2.0; platform_system != 'Darwin' or platform_machine != 'arm64'", "tensorflow-macos~=2.0; platform_system == 'Darwin' and platform_machine == 'arm64'",]
tensorflow-tensorflowmodeldataset = ["tensorflow~=2.0; platform_system != 'Darwin' or platform_machine != 'arm64'", "tensorflow-macos~=2.0; platform_system == 'Darwin' and platform_machine == 'arm64'"]
tensorflow = ["kedro-datasets[tensorflow-tensorflowmodeldataset]"]

text-textdataset = []
Expand All @@ -178,7 +178,7 @@ langchain-chatopenaidataset = ["langchain-openai~=0.1.7"]
langchain-openaiembeddingsdataset = ["langchain-openai~=0.1.7"]
langchain-chatanthropicdataset = ["langchain-anthropic~=0.1.13", "langchain-community~=0.2.0"]
langchain-chatcoheredataset = ["langchain-cohere~=0.1.5", "langchain-community~=0.2.0"]
langchain = ["kedro-datasets[langchain-chatopenaidataset,langchain-openaiembeddingsdataset,langchain-chatanthropicdataset,langchain-chatcoheredataset ]"]
langchain = ["kedro-datasets[langchain-chatopenaidataset,langchain-openaiembeddingsdataset,langchain-chatanthropicdataset,langchain-chatcoheredataset]"]

netcdf-netcdfdataset = ["h5netcdf>=1.2.0","netcdf4>=1.6.4","xarray>=2023.1.0"]
netcdf = ["kedro-datasets[netcdf-netcdfdataset]"]
Expand Down Expand Up @@ -236,7 +236,7 @@ test = [
"openpyxl>=3.0.3, <4.0",
"pandas-gbq>=0.12.0",
"pandas>=2.0",
"Pillow~=9.0",
"Pillow~=10.0",
"plotly>=4.8.0, <6.0",
"polars[xlsx2csv, deltalake]~=0.18.0",
"pre-commit>=2.9.2",
Expand Down
4 changes: 2 additions & 2 deletions kedro-docker/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Kedro-Docker

[![Python Version](https://img.shields.io/badge/python-3.8%20%7C%203.9%20%7C%203.10%20%7C%203.11%20%7C%203.12-blue.svg)](https://pypi.org/project/kedro-docker/)
[![Python Version](https://img.shields.io/badge/python-3.9%20%7C%203.10%20%7C%203.11%20%7C%203.12-blue.svg)](https://pypi.org/project/kedro-docker/)
[![PyPI version](https://badge.fury.io/py/kedro-docker.svg)](https://pypi.org/project/kedro-docker/)
[![License](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
[![Code Style: Black](https://img.shields.io/badge/code%20style-black-black.svg)](https://github.com/ambv/black)
Expand Down Expand Up @@ -63,7 +63,7 @@ Behind the scenes Kedro does the following:
> *Note:* By default, `kedro docker build` creates an image without Spark and Hadoop.
> *Note:* By default, when calling `kedro docker build` image is built with `python:VERSION-buster` image, where VERSION is Python (major + minor) version from the current environment. By specifying `--base-image` option, different base image can be used. For example `kedro docker build --base-image="python:3.8-buster"`.
> *Note:* By default, when calling `kedro docker build` image is built with `python:VERSION-buster` image, where VERSION is Python (major + minor) version from the current environment. By specifying `--base-image` option, different base image can be used. For example `kedro docker build --base-image="python:3.9-buster"`.
> *Note:* You can generate the `Dockerfile`, `.dockerignore` or `.dive-ci` files without building the image by running `kedro docker init`. This might be of use in case you would like to modify these files before the first build.
Expand Down
4 changes: 4 additions & 0 deletions kedro-docker/RELEASE.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Upcoming Release

# Release 0.7.0
## Major features and improvements
* Removed support for python 3.8

# Release 0.6.1
* Unpinned pip version requirement

Expand Down
3 changes: 2 additions & 1 deletion kedro-docker/features/steps/sh_run.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import shlex
import subprocess
from typing import Sequence, Union
from collections.abc import Sequence
from typing import Union

import psutil

Expand Down
6 changes: 3 additions & 3 deletions kedro-docker/features/steps/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from pathlib import Path
from threading import Thread
from time import sleep, time
from typing import Any, Callable, List
from typing import Any, Callable

import docker
from kedro.framework.cli.utils import get_pkg_version
Expand Down Expand Up @@ -130,7 +130,7 @@ def init_docker_client(**kwargs) -> docker.client.DockerClient:
return docker.from_env(**kwargs)


def get_docker_containers(name: str) -> List[docker.models.containers.Container]:
def get_docker_containers(name: str) -> list[docker.models.containers.Container]:
"""
Get list of docker containers which contain `name` in their names.
Expand Down Expand Up @@ -164,7 +164,7 @@ def docker_prune():
client.images.prune()


def get_docker_images(name: str) -> List[docker.models.images.Image]:
def get_docker_images(name: str) -> list[docker.models.images.Image]:
"""
Get docker images with `name` in their names.
Expand Down
2 changes: 1 addition & 1 deletion kedro-docker/kedro_docker/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
import shutil
import socket
import subprocess
from collections.abc import Sequence
from importlib import import_module
from itertools import chain
from pathlib import Path, PurePosixPath
from subprocess import DEVNULL, PIPE
from typing import Sequence

from click import secho
from kedro.framework.cli.utils import KedroCliError
Expand Down
4 changes: 2 additions & 2 deletions kedro-docker/kedro_docker/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

import shlex
import subprocess
from collections.abc import Sequence
from pathlib import Path
from sys import version_info
from typing import Dict, Sequence

import click
from kedro import __version__ as kedro_version
Expand Down Expand Up @@ -191,7 +191,7 @@ def docker_build(ctx, uid, gid, spark, base_image, image, docker_args): # noqa:
call(command)


def _mount_info() -> Dict[str, Sequence[str]]:
def _mount_info() -> dict[str, Sequence[str]]:
res = {
"host_root": str(Path.cwd()),
"container_root": "/home/kedro_docker",
Expand Down
2 changes: 1 addition & 1 deletion kedro-docker/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ authors = [
{name = "Kedro"}
]
description = "Kedro-Docker makes it easy to package Kedro projects with Docker."
requires-python = ">=3.8"
requires-python = ">=3.9"
license = {text = "Apache Software License (Apache 2.0)"}
dependencies = [
"anyconfig~=0.10.0", # not directly required, pinned by Snyk to avoid a vulnerability
Expand Down
2 changes: 1 addition & 1 deletion kedro-telemetry/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Kedro-Telemetry

[![Python Version](https://img.shields.io/badge/python-3.8%20%7C%203.9%20%7C%203.10%20%7C%203.11%20%7C%203.12-blue.svg)](https://pypi.org/project/kedro-telemetry/)
[![Python Version](https://img.shields.io/badge/python-3.9%20%7C%203.10%20%7C%203.11%20%7C%203.12-blue.svg)](https://pypi.org/project/kedro-telemetry/)
[![PyPI version](https://badge.fury.io/py/kedro-telemetry.svg)](https://pypi.org/project/kedro-telemetry/)
[![License](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
[![Code Style: Black](https://img.shields.io/badge/code%20style-black-black.svg)](https://github.com/ambv/black)
Expand Down
3 changes: 3 additions & 0 deletions kedro-telemetry/RELEASE.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Upcoming release

# Release 0.7.0
* Removed support for Python 3.8

# Release 0.6.1
* Changed Kedro CLI loading method to improve loading times.
* Changed logging level from error to debug for most logging messages.
Expand Down
1 change: 1 addition & 0 deletions kedro-telemetry/kedro_telemetry/masking.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Module containing command masking functionality."""

from __future__ import annotations

from typing import Any
Expand Down
2 changes: 1 addition & 1 deletion kedro-telemetry/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ authors = [
{name = "Kedro"}
]
description = "Kedro-Telemetry"
requires-python = ">=3.8"
requires-python = ">=3.9"
license = {text = "Apache Software License (Apache 2.0)"}
dependencies = [
"kedro>=0.18.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""dummy_project file for ensuring the package is executable
as `dummy-project` and `python -m dummy_project`
"""

import importlib
from pathlib import Path

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
"""Project pipelines."""
from typing import Dict

from kedro.framework.project import find_pipelines
from kedro.pipeline import Pipeline


def register_pipelines() -> Dict[str, Pipeline]:
def register_pipelines() -> dict[str, Pipeline]:
"""Register the project's pipelines.
Returns:
Expand Down

0 comments on commit 6e359fa

Please sign in to comment.