Skip to content

Commit 6c697a6

Browse files
Merge pull request #2986 from SwissDataScienceCenter/release-1.5.0
2 parents af139c4 + d58f20a commit 6c697a6

File tree

129 files changed

+3396
-857
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

129 files changed

+3396
-857
lines changed

.github/workflows/test_deploy.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -924,6 +924,8 @@ jobs:
924924
git config --global --add user.name "Renku Bot"
925925
git config --global --add user.email "[email protected]"
926926
- name: merge changes from master
927+
env:
928+
GITHUB_TOKEN: ${{ secrets.RENKUBOT_GITHUB_TOKEN }}
927929
run: |
928930
git merge origin/master --message "Merge branch 'master' into develop"
929931
git push

.pre-commit-config.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,7 @@ repos:
5252
- types-tabulate<0.8.10,>=0.7.7
5353
- attrs<21.5.0,>=21.4.0
5454
- filelock>=3.3.0,<3.6.1
55+
- repo: https://github.com/hadolint/hadolint
56+
rev: master
57+
hooks:
58+
- id: hadolint-docker

CHANGES.rst

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,36 @@
1818
Changes
1919
=======
2020

21+
22+
`1.5.0 <https://github.com/SwissDataScienceCenter/renku-python/compare/v1.4.0...v1.5.0>`__ (2022-07-04)
23+
-------------------------------------------------------------------------------------------------------
24+
25+
Bug Fixes
26+
~~~~~~~~~
27+
28+
- **service:** correctly use project namespace when generating project id
29+
(`#2958 <https://github.com/SwissDataScienceCenter/renku-python/issues/2958>`__)
30+
(`6995098 <https://github.com/SwissDataScienceCenter/renku-python/commit/69950981bc51d252d1287c254a5c2ac2a352f665>`__)
31+
32+
Features
33+
~~~~~~~~
34+
35+
- **core:** allow partial updates on dataset and project edit
36+
(`#2949 <https://github.com/SwissDataScienceCenter/renku-python/issues/2949>`__)
37+
(`3daa1ec <https://github.com/SwissDataScienceCenter/renku-python/commit/3daa1ecdc803043dd7618ad7a3a1a6d3ca2897de>`__)
38+
- **dataset:** export to a local directory
39+
(`#2944 <https://github.com/SwissDataScienceCenter/renku-python/issues/2944>`__)
40+
(`9090869 <https://github.com/SwissDataScienceCenter/renku-python/commit/9090869692d0ba24e969ce6e43a2b360a074698f>`__)
41+
- **dataset:** filter ls-files by tag
42+
(`#2950 <https://github.com/SwissDataScienceCenter/renku-python/issues/2950>`__)
43+
(`73866f2 <https://github.com/SwissDataScienceCenter/renku-python/commit/73866f2f936fee8e037d068f64cd8ee5aa1c0a41>`__)
44+
- **service:** support chunked file uploads
45+
(`#2892 <https://github.com/SwissDataScienceCenter/renku-python/issues/2892>`__)
46+
(`610e88a <https://github.com/SwissDataScienceCenter/renku-python/commit/610e88ab50ab13b55fb89d9643a948b6d36daa0b>`__)
47+
- **workflow:** workflow revert command
48+
(`#2956 <https://github.com/SwissDataScienceCenter/renku-python/issues/2956>`__)
49+
(`cb0e73d <https://github.com/SwissDataScienceCenter/renku-python/commit/cb0e73d0016a344500d8829edcccd2982e929441>`__)
50+
2151
`1.4.0 <https://github.com/SwissDataScienceCenter/renku-python/compare/v1.3.1...v1.4.0>`__ (2022-06-10)
2252
-------------------------------------------------------------------------------------------------------
2353

DEVELOPING.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,8 @@ number.
247247
the version number in the header and to replace the `=` underline with `-`.
248248
- Proof-read the changelog and adjust messages so they make sense to third
249249
parties reading the changelog
250-
- Update the version in `helm-chart/renku-core/Chart.yaml` and `helm-chart/renku-core/values.yaml`
251-
(for `versions.latest.image.tag`).
250+
- Update the version in `helm-chart/renku-core/Chart.yaml`, `helm-chart/renku-core/values.yaml`
251+
(for `versions.latest.image.tag`), and `renku/version.py`.
252252
- Commit the changes to the release branch, with a message like "chore: release
253253
v1.2.3"
254254
- Push the release branch and create a PR **against master**. Wait for it to be

Dockerfile

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,46 @@
11
FROM python:3.9-slim as base
22

3+
# hadolint ignore=DL3008,DL3009,DL3013
34
RUN apt-get update && \
4-
apt-get install -y git git-lfs=2.* python3-dev && \
5-
pip install --no-cache --upgrade pip poetry
5+
apt-get install --no-install-recommends -y git git-lfs=2.* python3-dev && \
6+
pip install --no-cache-dir --upgrade pip poetry
67

78
FROM base as builder
89

9-
RUN apt-get install -y build-essential && \
10-
apt-get clean
10+
# hadolint ignore=DL3008
11+
RUN apt-get install --no-install-recommends -y build-essential && \
12+
apt-get clean && rm -rf /var/lib/apt/lists/*
1113

1214
# The python install is done in two steps to avoid re-installing all dependencies every
1315
# time the code changes
1416
COPY pyproject.toml poetry.lock README.rst CHANGES.rst Makefile /code/renku/
1517
WORKDIR /code/renku
1618
RUN poetry export --without-hashes -f requirements.txt --output /tmp/requirements.txt && \
17-
pip install -r /tmp/requirements.txt && \
18-
pip install poetry-dynamic-versioning==0.17.1
19+
pip install --no-cache-dir -r /tmp/requirements.txt && \
20+
pip install --no-cache-dir poetry-dynamic-versioning==0.17.1
1921

2022
COPY .git /code/renku/.git
2123
COPY renku /code/renku/renku
2224

2325
# Set CLEAN_INSTALL to a non-null value to ensure that only a committed version of
2426
# renku-python is installed in the image. This is the default for chartpress builds.
2527
ARG CLEAN_INSTALL
26-
RUN if [ -n "${CLEAN_INSTALL}" ]; then git reset --hard ; fi
27-
28-
RUN make download-templates
28+
RUN if [ -n "${CLEAN_INSTALL}" ]; then git reset --hard ; fi && \
29+
make download-templates
2930

3031
# set the BUILD_CORE_SERVICE to non null to install additional service dependencies
3132
ARG BUILD_CORE_SERVICE
32-
RUN if [ -n "${BUILD_CORE_SERVICE}" ]; then export EXT_BUILD=[service] ; fi && \
33-
pip wheel --wheel-dir /wheels .${EXT_BUILD} && \
34-
pip install --no-index --no-warn-script-location --force --root=/pythonroot/ /wheels/*.whl
33+
RUN if [ -n "${BUILD_CORE_SERVICE}" ]; then export EXT_BUILD="[service]" ; fi && \
34+
pip wheel --wheel-dir /wheels ".${EXT_BUILD}" && \
35+
pip install --no-cache-dir --no-index --no-warn-script-location --force --root=/pythonroot/ /wheels/*.whl
3536

3637
FROM base
3738

39+
ARG BUILD_CORE_SERVICE
3840
RUN addgroup -gid 1000 shuhitsu && \
3941
useradd -m -u 1000 -g shuhitsu shuhitsu && \
4042
git lfs install && \
41-
if [ -n "${BUILD_CORE_SERVICE}"]; then mkdir /svc && chown shuhitsu:shuhitsu /svc ; fi
43+
if [ -n "${BUILD_CORE_SERVICE}" ]; then mkdir /svc && chown shuhitsu:shuhitsu /svc ; fi
4244

4345
COPY --from=builder /pythonroot/ /
4446

143 Bytes
Binary file not shown.

docs/cheatsheet_hash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
3e7d7567c17eba64945b70a3c1009343 cheatsheet.tex
1+
62d4f12d9be4d80c0dfbdef2957fde9a cheatsheet.tex
22
c70c179e07f04186ec05497564165f11 sdsc_cheatsheet.cls

docs/conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,7 @@
356356
("py:class", "IDatasetGateway"),
357357
("py:class", "IPlanGateway"),
358358
("py:class", "LocalClient"),
359+
("py:class", "NoValueType"),
359360
("py:class", "OID_TYPE"),
360361
("py:class", "Path"),
361362
("py:class", "Persistent"),

docs/reference/core.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -244,10 +244,6 @@ Utilities
244244
:members:
245245
:show-inheritance:
246246

247-
.. automodule:: renku.core.util.scm
248-
:members:
249-
:show-inheritance:
250-
251247
.. automodule:: renku.core.util.shacl
252248
:members:
253249
:show-inheritance:

docs/spelling_wordlist.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,16 +74,17 @@ filesystem
7474
FilterFlights
7575
findable
7676
Fortran
77+
GitLab
78+
GitPython
79+
GraphQL
7780
gapped
7881
git-lfs
82+
gitattributes
7983
github
8084
gitignore
8185
gitkeep
8286
gitlab
83-
GitLab
8487
gitlabClientSecret
85-
GitPython
86-
GraphQL
8788
hexsha
8889
Homebrew
8990
hostname

0 commit comments

Comments
 (0)