Skip to content

Commit

Permalink
Merge pull request #3228 from SwissDataScienceCenter/release/v1.10.0
Browse files Browse the repository at this point in the history
chore: release v1.10.0
  • Loading branch information
m-alisafaee authored Nov 29, 2022
2 parents e4c9eb6 + 8604d1b commit 0046bd0
Show file tree
Hide file tree
Showing 32 changed files with 588 additions and 133 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/acceptance-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
persist: ${{ steps.deploy-comment.outputs.persist}}
steps:
- id: deploy-comment
uses: SwissDataScienceCenter/renku-actions/check-pr-description@v1.2.0
uses: SwissDataScienceCenter/renku-actions/check-pr-description@v1.4.1
with:
string: /deploy
pr_ref: ${{ github.event.number }}
Expand All @@ -43,7 +43,7 @@ jobs:
name: renku-ci-rp-${{ github.event.number }}
steps:
- name: deploy-pr
uses: SwissDataScienceCenter/renku-actions/deploy-renku@v1.2.0
uses: SwissDataScienceCenter/renku-actions/deploy-renku@v1.4.1
env:
DOCKER_PASSWORD: ${{ secrets.RENKU_DOCKER_PASSWORD }}
DOCKER_USERNAME: ${{ secrets.RENKU_DOCKER_USERNAME }}
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:
if: ${{ github.event.action != 'closed' && needs.check-deploy.outputs.pr-contains-string == 'true' && needs.check-deploy.outputs.test-enabled == 'true' }}
needs: [check-deploy, deploy-pr]
steps:
- uses: SwissDataScienceCenter/renku-actions/test-renku@v1.2.0
- uses: SwissDataScienceCenter/renku-actions/test-renku@v1.4.1
with:
kubeconfig: ${{ secrets.RENKUBOT_DEV_KUBECONFIG }}
renku-release: renku-ci-rp-${{ github.event.number }}
Expand All @@ -103,7 +103,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: renku teardown
uses: SwissDataScienceCenter/renku-actions/cleanup-renku-ci-deployments@v1.2.0
uses: SwissDataScienceCenter/renku-actions/cleanup-renku-ci-deployments@v1.4.1
env:
HELM_RELEASE_REGEX: "^renku-ci-rp-${{ github.event.number }}$"
GITLAB_TOKEN: ${{ secrets.DEV_GITLAB_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -986,7 +986,7 @@ jobs:
echo "GIT_USER=Renku Bot" >> $GITHUB_ENV
echo "[email protected]" >> $GITHUB_ENV
- name: Push chart and images
uses: SwissDataScienceCenter/renku-actions/publish-chart@v1.2.0
uses: SwissDataScienceCenter/renku-actions/publish-chart@v1.4.1
env:
CHART_NAME: renku-core
GITHUB_TOKEN: ${{ secrets.RENKUBOT_GITHUB_TOKEN }}
Expand All @@ -995,7 +995,7 @@ jobs:
- name: Wait for chart to be available
run: sleep 120
- name: Update component version
uses: SwissDataScienceCenter/renku-actions/update-component-version@v1.2.0
uses: SwissDataScienceCenter/renku-actions/update-component-version@v1.4.1
env:
CHART_NAME: renku-core
GITHUB_TOKEN: ${{ secrets.RENKUBOT_GITHUB_TOKEN }}
Expand Down
20 changes: 20 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,26 @@
Changes
=======

`1.10.0 <https://github.com/SwissDataScienceCenter/renku-python/compare/v1.9.3...v1.10.0>`__ (2022-11-28)
=========================================================================================================

Bug Fixes
~~~~~~~~~

- **workflow:** list composite plans
(`#3218 <https://github.com/SwissDataScienceCenter/renku-python/issues/3218>`__)
(`98a4b22 <https://github.com/SwissDataScienceCenter/renku-python/commit/98a4b22b3c5f1ab56255811f9f36ea89ede026d6>`__)

Features
~~~~~~~~

- **core:** inform users about push in renku save
(`#3194 <https://github.com/SwissDataScienceCenter/renku-python/issues/3194>`__)
(`2f7f936 <https://github.com/SwissDataScienceCenter/renku-python/commit/2f7f936b35161469d18817b9016d0a5802842a3f>`__)
- **service:** add workflow export endpoint
(`#3212 <https://github.com/SwissDataScienceCenter/renku-python/issues/3212>`__)
(`bb50f86 <https://github.com/SwissDataScienceCenter/renku-python/commit/bb50f86f1adf1e24cec601d689d3bb8aa2ddaeb5>`__)

`1.9.3 <https://github.com/SwissDataScienceCenter/renku-python/compare/v1.9.2...v1.9.3>`__ (2022-11-17)
-------------------------------------------------------------------------------------------------------

Expand Down
1 change: 1 addition & 0 deletions docs/spelling_wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ Postgresql
powerline
pre
prepend
prepended
prepending
preprocessed
preprocessing
Expand Down
2 changes: 1 addition & 1 deletion helm-chart/renku-core/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ appVersion: "1.0"
description: A Helm chart for Kubernetes
name: renku-core
icon: https://avatars0.githubusercontent.com/u/53332360?s=400&u=a4311d22842343604ef61a8c8a1e5793209a67e9&v=4
version: 1.9.3
version: 1.10.0
2 changes: 1 addition & 1 deletion helm-chart/renku-core/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ versions:
fullnameOverride: ""
image:
repository: renku/renku-core
tag: "v1.9.3"
tag: "v1.10.0"
pullPolicy: IfNotPresent
v8:
name: v8
Expand Down
129 changes: 76 additions & 53 deletions poetry.lock

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ importlib-resources = { version = ">=5.4.0,<5.10.0", python = "<3.9.0" }
inject = "<4.4.0,>=4.3.0"
isort = { version = "<5.10.2,>=5.3.2", optional = true }
jinja2 = { version = ">=2.11.3,<3.1.3" }
marshmallow = { version = ">=3.14.0,<3.18.0", optional = true }
marshmallow = { version = ">=3.18.0", optional = true }
marshmallow-oneofschema = { version=">=3.0.1,<4.0.0", optional = true }
mypy = {version = ">=0.942,<1.0", optional = true}
networkx = "<2.7,>=2.6.0"
Expand Down Expand Up @@ -123,7 +123,7 @@ rdflib = "<7.0,>=6.0.0"
redis = { version = ">=3.5.3,<4.2.0", optional = true }
renku-sphinx-theme = { version = ">=0.2.0", optional = true }
requests = ">=2.23.0,<2.28.2"
responses = { version = ">=0.7.0,<0.22.0", optional = true }
responses = { version = ">=0.7.0,<=0.22.0", optional = true }
rich = ">=9.3.0,<12.6.0"
rq = { version = "==1.11.0", optional = true }
rq-scheduler = { version = "==0.11.0", optional = true }
Expand Down Expand Up @@ -343,6 +343,7 @@ files = [
"renku/**/*.py",
"tests/**/*.py"
]
implicit_optional = true

[[tool.mypy.overrides]]
module = [
Expand Down
2 changes: 2 additions & 0 deletions renku/command/command_builder/command.py
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,8 @@ def command(self, operation: Callable):
def working_directory(self, directory: str) -> "Command":
"""Set the working directory for the command.
WARNING: Should not be used in the core service.
Args:
directory(str): The working directory to work in.
Expand Down
1 change: 1 addition & 0 deletions renku/command/view_model/composite_plan.py
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ def __init__(
self.touches_existing_files = touches_existing_files
self.latest = latest
self.type = "CompositePlan"
self.full_command = ""

if duration is not None:
self.duration = duration.seconds
Expand Down
4 changes: 3 additions & 1 deletion renku/core/dataset/dataset.py
Original file line number Diff line number Diff line change
Expand Up @@ -570,6 +570,7 @@ def update_datasets(
check_data_directory: bool,
update_all: bool,
dry_run: bool,
plain: bool,
dataset_gateway: IDatasetGateway,
) -> Tuple[List[DatasetViewModel], List[DatasetFileViewModel]]:
"""Update dataset files.
Expand All @@ -587,6 +588,7 @@ def update_datasets(
check_data_directory(bool): Whether to check the dataset's data directory for new files.
update_all(bool): Whether to update all datasets.
dry_run(bool): Whether to return a preview of what would be updated.
plain(bool): Whether plain output should be produced.
dataset_gateway(IDatasetGateway): Injected dataset gateway.
"""
from renku.core.dataset.providers.renku import RenkuProvider
Expand Down Expand Up @@ -680,7 +682,7 @@ def update_datasets(
)

if not records:
if must_match_records:
if must_match_records and not plain:
raise errors.ParameterError("No files matched the criteria.")
return imported_dataset_updates_view_models, []

Expand Down
2 changes: 1 addition & 1 deletion renku/core/plugin/dataset_provider.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@


@hookspec
def dataset_provider() -> "Type[ProviderApi]":
def dataset_provider() -> "Type[ProviderApi]": # type: ignore[empty-body]
"""Plugin Hook for different dataset providers.
Returns:
Expand Down
2 changes: 1 addition & 1 deletion renku/core/plugin/session.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@


@hookspec
def session_provider() -> Tuple[ISessionProvider, str]:
def session_provider() -> Tuple[ISessionProvider, str]: # type: ignore[empty-body]
"""Plugin Hook for ``session`` sub-command.
Returns:
Expand Down
21 changes: 16 additions & 5 deletions renku/core/plugin/workflow.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@


@hookspec
def workflow_format() -> Tuple[IWorkflowConverter, List[str]]: # type: ignore
def workflow_format() -> Tuple[IWorkflowConverter, List[str]]: # type: ignore[empty-body]
"""Plugin Hook for ``workflow export`` call.
Can be used to export renku workflows in different formats.
Expand All @@ -44,9 +44,14 @@ def workflow_format() -> Tuple[IWorkflowConverter, List[str]]: # type: ignore


@hookspec(firstresult=True)
def workflow_convert(
workflow: Plan, basedir: Path, output: Optional[Path], output_format: Optional[str]
) -> str: # type: ignore
def workflow_convert( # type: ignore[empty-body]
workflow: Plan,
basedir: Path,
output: Optional[Path],
output_format: Optional[str],
resolve_paths: bool,
nest_workflows: bool,
) -> str:
"""Plugin Hook for ``workflow export`` call.
Can be used to export renku workflows in different formats.
Expand Down Expand Up @@ -82,7 +87,13 @@ class WorkflowConverterProtocol(Protocol):
"""Typing protocol to specify type of the workflow converter hook."""

def __call__(
self, workflow: Plan, basedir: Path, output: Optional[Path] = None, output_format: Optional[str] = None
self,
workflow: Plan,
basedir: Path,
output: Optional[Path] = None,
output_format: Optional[str] = None,
resolve_paths: Optional[bool] = None,
nest_workflows: Optional[bool] = None,
) -> str:
"""Dummy method to let mypy know the type of the hook implementation."""
raise NotImplementedError()
Expand Down
2 changes: 1 addition & 1 deletion renku/core/util/git.py
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ def get_full_repository_path(url: Optional[str]) -> str:
Returns:
The hostname plus path extracted from the URL.
"""
if not str:
if str is None:
return ""

parsed_url = parse_git_url(url)
Expand Down
5 changes: 5 additions & 0 deletions renku/core/util/yaml.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,11 @@ def write_yaml(path, data):
yaml.dump(data, fp, default_flow_style=False, Dumper=Dumper)


def dumps_yaml(data) -> str:
"""Convert YAML data to a YAML string."""
return yaml.dump(data)


def load_yaml(data):
"""Load YAML data and return its content as a dict."""
return yaml.load(data, Loader=NoDatesSafeLoader) or {}
Loading

0 comments on commit 0046bd0

Please sign in to comment.