Skip to content

Commit b264dbd

Browse files
olevskiPanaetiusdependabot[bot]mohammad-alisafaeelorenzo-cavazzi
authored
chore: release v1.3.1 (#2924)
Co-authored-by: Ralf Grubenmann <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mohammad Alisafaee <[email protected]> Co-authored-by: Lorenzo Cavazzi <[email protected]> Co-authored-by: Rok Roškar <[email protected]>
1 parent 659baf1 commit b264dbd

File tree

10 files changed

+91
-41
lines changed

10 files changed

+91
-41
lines changed

.github/workflows/test_deploy.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
if: steps.dependency-cache.outputs.cache-hit != 'true' || 'refs/heads/master' == github.ref || 'refs/heads/develop' == github.ref || startsWith(github.ref, 'refs/tags/')
6565
run: |
6666
python -m pip install --upgrade pip
67-
python -m pip install coveralls poetry wheel twine poetry-dynamic-versioning
67+
python -m pip install coveralls poetry wheel twine poetry-dynamic-versioning==0.17.1
6868
poetry-dynamic-versioning
6969
make download-templates
7070
python -m pip install .[all]
@@ -106,7 +106,7 @@ jobs:
106106
if: steps.dependency-cache.outputs.cache-hit != 'true' || 'refs/heads/master' == github.ref || 'refs/heads/develop' == github.ref || startsWith(github.ref, 'refs/tags/')
107107
run: |
108108
python -m pip install --upgrade pip
109-
python -m pip install coveralls poetry wheel twine poetry-dynamic-versioning
109+
python -m pip install coveralls poetry wheel twine poetry-dynamic-versioning==0.17.1
110110
poetry-dynamic-versioning
111111
make download-templates
112112
python -m pip install .[all]
@@ -145,7 +145,7 @@ jobs:
145145
if: steps.dependency-cache.outputs.cache-hit != 'true' || 'refs/heads/master' == github.ref || 'refs/heads/develop' == github.ref || startsWith(github.ref, 'refs/tags/')
146146
run: |
147147
python -m pip install --upgrade pip
148-
python -m pip install coveralls poetry wheel twine poetry-dynamic-versioning
148+
python -m pip install coveralls poetry wheel twine poetry-dynamic-versioning==0.17.1
149149
poetry-dynamic-versioning
150150
make download-templates
151151
python -m pip install .[all]
@@ -190,7 +190,7 @@ jobs:
190190
if: steps.cache.outputs.cache-hit != 'true'
191191
run: |
192192
python -m pip install --upgrade pip
193-
python -m pip install coveralls poetry wheel twine poetry-dynamic-versioning
193+
python -m pip install coveralls poetry wheel twine poetry-dynamic-versioning==0.17.1
194194
poetry-dynamic-versioning
195195
python -m pip install .[all]
196196
- name: Install renku into cache
@@ -250,7 +250,7 @@ jobs:
250250
if: steps.dependency-cache.outputs.cache-hit != 'true' || 'refs/heads/master' == github.ref || 'refs/heads/develop' == github.ref || startsWith(github.ref, 'refs/tags/')
251251
run: |
252252
python -m pip install --upgrade pip
253-
python -m pip install coveralls poetry wheel twine poetry-dynamic-versioning
253+
python -m pip install coveralls poetry wheel twine poetry-dynamic-versioning==0.17.1
254254
poetry-dynamic-versioning
255255
make download-templates
256256
pip install .[all]
@@ -296,7 +296,7 @@ jobs:
296296
if: steps.dependency-cache.outputs.cache-hit != 'true' || 'refs/heads/master' == github.ref || 'refs/heads/develop' == github.ref || startsWith(github.ref, 'refs/tags/')
297297
run: |
298298
python -m pip install --upgrade pip
299-
python -m pip install coveralls poetry wheel twine poetry-dynamic-versioning
299+
python -m pip install coveralls poetry wheel twine poetry-dynamic-versioning==0.17.1
300300
poetry-dynamic-versioning
301301
make download-templates
302302
python -m pip install .[all]
@@ -354,7 +354,7 @@ jobs:
354354
if: steps.dependency-cache.outputs.cache-hit != 'true' || 'refs/heads/master' == github.ref || 'refs/heads/develop' == github.ref || startsWith(github.ref, 'refs/tags/')
355355
run: |
356356
python -m pip install --upgrade pip
357-
python -m pip install coveralls poetry wheel twine poetry-dynamic-versioning
357+
python -m pip install coveralls poetry wheel twine poetry-dynamic-versioning==0.17.1
358358
poetry-dynamic-versioning
359359
make download-templates
360360
python -m pip install .[all]
@@ -418,7 +418,7 @@ jobs:
418418
if: steps.dependency-cache.outputs.cache-hit != 'true' || 'refs/heads/master' == github.ref || 'refs/heads/develop' == github.ref || startsWith(github.ref, 'refs/tags/')
419419
run: |
420420
python -m pip install --upgrade pip
421-
python -m pip install coveralls poetry wheel twine poetry-dynamic-versioning
421+
python -m pip install coveralls poetry wheel twine poetry-dynamic-versioning==0.17.1
422422
poetry-dynamic-versioning
423423
make download-templates
424424
python -m pip install .[all]
@@ -482,7 +482,7 @@ jobs:
482482
if: steps.dependency-cache.outputs.cache-hit != 'true' || 'refs/heads/master' == github.ref || 'refs/heads/develop' == github.ref || startsWith(github.ref, 'refs/tags/')
483483
run: |
484484
python -m pip install --upgrade pip
485-
python -m pip install coveralls poetry wheel twine poetry-dynamic-versioning
485+
python -m pip install coveralls poetry wheel twine poetry-dynamic-versioning==0.17.1
486486
poetry-dynamic-versioning
487487
make download-templates
488488
python -m pip install .[all]
@@ -532,7 +532,7 @@ jobs:
532532
curl -L https://raw.githubusercontent.com/Homebrew/homebrew-core/43842898fd3ff43273466052722f5ba2789196cb/Formula/git-lfs.rb > git-lfs.rb && brew install git-lfs.rb && rm git-lfs.rb
533533
brew install shellcheck node || brew link --overwrite node
534534
python -m pip install --upgrade pip
535-
python -m pip install wheel poetry-dynamic-versioning
535+
python -m pip install wheel poetry-dynamic-versioning==0.17.1
536536
poetry-dynamic-versioning
537537
make download-templates
538538
python -m pip install .[all]
@@ -568,7 +568,7 @@ jobs:
568568
curl -L https://raw.githubusercontent.com/Homebrew/homebrew-core/43842898fd3ff43273466052722f5ba2789196cb/Formula/git-lfs.rb > git-lfs.rb && brew install git-lfs.rb && rm git-lfs.rb
569569
brew install shellcheck node || brew link --overwrite node
570570
python -m pip install --upgrade pip
571-
python -m pip install wheel poetry-dynamic-versioning
571+
python -m pip install wheel poetry-dynamic-versioning==0.17.1
572572
poetry-dynamic-versioning
573573
make download-templates
574574
python -m pip install .[all]
@@ -611,7 +611,7 @@ jobs:
611611
curl -L https://raw.githubusercontent.com/Homebrew/homebrew-core/43842898fd3ff43273466052722f5ba2789196cb/Formula/git-lfs.rb > git-lfs.rb && brew install git-lfs.rb && rm git-lfs.rb
612612
brew install shellcheck node || brew link --overwrite node
613613
python -m pip install --upgrade pip
614-
python -m pip install wheel poetry-dynamic-versioning
614+
python -m pip install wheel poetry-dynamic-versioning==0.17.1
615615
make download-templates
616616
poetry-dynamic-versioning
617617
python -m pip install .[all]
@@ -696,7 +696,7 @@ jobs:
696696
if: steps.dependency-cache.outputs.cache-hit != 'true' || 'refs/heads/master' == github.ref || 'refs/heads/develop' == github.ref || startsWith(github.ref, 'refs/tags/')
697697
run: |
698698
python -m pip install --upgrade pip
699-
python -m pip install coveralls poetry wheel twine poetry-dynamic-versioning
699+
python -m pip install coveralls poetry wheel twine poetry-dynamic-versioning==0.17.1
700700
poetry-dynamic-versioning
701701
make download-templates
702702
python -m pip install .[all]
@@ -775,7 +775,7 @@ jobs:
775775
if: steps.dependency-cache.outputs.cache-hit != 'true' || 'refs/heads/master' == github.ref || 'refs/heads/develop' == github.ref || startsWith(github.ref, 'refs/tags/')
776776
run: |
777777
python -m pip install --upgrade pip
778-
python -m pip install coveralls poetry wheel twine poetry-dynamic-versioning
778+
python -m pip install coveralls poetry wheel twine poetry-dynamic-versioning==0.17.1
779779
poetry-dynamic-versioning
780780
make download-templates
781781
python -m pip install .[all]
@@ -890,7 +890,7 @@ jobs:
890890
- name: Install dependencies
891891
run: |
892892
python -m pip install --upgrade pip
893-
python -m pip install poetry poetry-dynamic-versioning poetry-lock-package twine
893+
python -m pip install poetry poetry-dynamic-versioning==0.17.1 poetry-lock-package twine
894894
python -m pip install .[all]
895895
git config --global --add user.name "Renku Bot"
896896
git config --global --add user.email "[email protected]"

CHANGES.rst

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

21+
`1.3.1 <https://github.com/SwissDataScienceCenter/renku-python/compare/v1.3.0...v1.3.1>`__ (2022-05-23)
22+
-------------------------------------------------------------------------------------------------------
23+
24+
Bug Fixes
25+
~~~~~~~~~
26+
27+
- **ci:** pin poetry-dynamic-versioning to 0.17.1
28+
(`#2920 <https://github.com/SwissDataScienceCenter/renku-python/issues/2920>`__)
29+
(`239ef76 <https://github.com/SwissDataScienceCenter/renku-python/commit/239ef766c441ee534a850a965337d9a8126a1588>`__)
30+
31+
Features
32+
~~~~~~~~
33+
34+
- **cli:** show spinner when cloning repo for dataset import/update
35+
(`#2914 <https://github.com/SwissDataScienceCenter/renku-python/issues/2914>`__)
36+
(`46508af <https://github.com/SwissDataScienceCenter/renku-python/commit/46508af8573dba967e8ac91420a69c2180d0d7c5>`__)
37+
2138
`1.3.0 <https://github.com/SwissDataScienceCenter/renku-python/compare/v1.2.4...v1.3.0>`__ (2022-05-20)
2239
-------------------------------------------------------------------------------------------------------
2340

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ COPY pyproject.toml poetry.lock README.rst CHANGES.rst Makefile /code/renku/
1515
WORKDIR /code/renku
1616
RUN poetry export --without-hashes -f requirements.txt --output /tmp/requirements.txt && \
1717
pip install -r /tmp/requirements.txt && \
18-
pip install poetry-dynamic-versioning
18+
pip install poetry-dynamic-versioning==0.17.1
1919

2020
COPY .git /code/renku/.git
2121
COPY renku /code/renku/renku

helm-chart/renku-core/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ appVersion: "1.0"
33
description: A Helm chart for Kubernetes
44
name: renku-core
55
icon: https://avatars0.githubusercontent.com/u/53332360?s=400&u=a4311d22842343604ef61a8c8a1e5793209a67e9&v=4
6-
version: 1.3.0
6+
version: 1.3.1

helm-chart/renku-core/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ versions:
109109
fullnameOverride: ""
110110
image:
111111
repository: renku/renku-core
112-
tag: "v1.3.0"
112+
tag: "v1.3.1"
113113
pullPolicy: IfNotPresent
114114
v8:
115115
name: v8

renku/core/dataset/dataset.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1023,9 +1023,10 @@ def update_dataset_git_files(
10231023
if url in visited_repos:
10241024
remote_repository, remote_client = visited_repos[url]
10251025
else:
1026-
remote_repository = clone_repository(
1027-
url=url, path=get_cache_directory_for_repository(client=client, url=url), checkout_revision=ref
1028-
)
1026+
with communication.busy(msg="Cloning remote repository..."):
1027+
remote_repository = clone_repository(
1028+
url=url, path=get_cache_directory_for_repository(client=client, url=url), checkout_revision=ref
1029+
)
10291030
remote_client = LocalClient(path=remote_repository.path)
10301031
visited_repos[url] = remote_repository, remote_client
10311032

renku/core/dataset/providers/renku.py

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -359,22 +359,23 @@ def _fetch_dataset(self, client_dispatcher: IClientDispatcher, database_dispatch
359359

360360
urls = (self._project_url_ssh, self._project_url_http)
361361
# Clone the project
362-
for url in urls:
363-
try:
364-
repository = clone_renku_repository(
365-
url=url,
366-
path=get_cache_directory_for_repository(client=client, url=url),
367-
gitlab_token=self._gitlab_token,
368-
deployment_hostname=parsed_uri.netloc,
369-
depth=None,
370-
reuse_existing_repository=True,
371-
use_renku_credentials=True,
372-
)
373-
except errors.GitError:
374-
pass
375-
else:
376-
self._project_url = url
377-
break
362+
with communication.busy(msg="Cloning remote repository..."):
363+
for url in urls:
364+
try:
365+
repository = clone_renku_repository(
366+
url=url,
367+
path=get_cache_directory_for_repository(client=client, url=url),
368+
gitlab_token=self._gitlab_token,
369+
deployment_hostname=parsed_uri.netloc,
370+
depth=None,
371+
reuse_existing_repository=True,
372+
use_renku_credentials=True,
373+
)
374+
except errors.GitError:
375+
pass
376+
else:
377+
self._project_url = url
378+
break
378379

379380
if self._project_url is None or repository is None:
380381
raise errors.ParameterError("Cannot clone remote projects:\n\t" + "\n\t".join(urls), param_hint=self._uri)

renku/core/session/session.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
from itertools import chain
2222
from typing import Optional
2323

24-
from yaspin import yaspin
25-
2624
from renku.command.command_builder import inject
2725
from renku.core import errors
2826
from renku.core.interface.client_dispatcher import IClientDispatcher
@@ -94,7 +92,7 @@ def session_start(
9492
abort=True,
9593
)
9694

97-
with yaspin(text="Building image"):
95+
with communication.busy(msg="Building image"):
9896
_ = provider_api.build_image(client.docker_path.parent, image_name, config)
9997
else:
10098
if not provider_api.find_image(image_name, config):

renku/core/util/communication.py

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
# limitations under the License.
1818
"""Communicator classes for printing output."""
1919

20+
from contextlib import ExitStack, contextmanager
2021
from functools import wraps
2122
from threading import RLock
2223

@@ -56,6 +57,14 @@ def has_prompt(self):
5657
def prompt(self, msg, type=None, default=None, **kwargs):
5758
"""Show a message prompt."""
5859

60+
@contextmanager
61+
def busy(self, msg):
62+
"""Indicate a busy status.
63+
64+
For instance, show a spinner in the CLI.
65+
"""
66+
yield
67+
5968

6069
def lock_communication(method):
6170
"""Ensure communicator is locked."""
@@ -177,6 +186,14 @@ def finalize_progress(self, name):
177186
for listener in self._listeners:
178187
listener.finalize_progress(name)
179188

189+
@contextmanager
190+
def busy(self, msg):
191+
"""Show busy indicators."""
192+
with ExitStack() as stack:
193+
for listener in self._listeners:
194+
stack.enter_context(listener.busy(msg))
195+
yield
196+
180197
@lock_communication
181198
def disable(self):
182199
"""Disable all outputs; by default everything is enabled."""
@@ -243,7 +260,7 @@ def warn(msg):
243260

244261
@ensure_manager
245262
def error(msg):
246-
"""Write an info message to all listeners."""
263+
"""Write an error message to all listeners."""
247264
_thread_local.communication_manager.error(msg)
248265

249266

@@ -283,6 +300,14 @@ def finalize_progress(name):
283300
_thread_local.communication_manager.finalize_progress(name)
284301

285302

303+
@ensure_manager
304+
@contextmanager
305+
def busy(msg):
306+
"""Indicate busy status to all listeners."""
307+
with _thread_local.communication_manager.busy(msg):
308+
yield
309+
310+
286311
@ensure_manager
287312
def get_listeners():
288313
"""Return a list of subscribed listeners."""

renku/ui/cli/utils/callback.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@
1818
"""Communicator class for printing click output."""
1919

2020
import sys
21+
from contextlib import contextmanager
2122

2223
import click
2324
from tqdm import tqdm
25+
from yaspin import yaspin
2426

2527
import renku.ui.cli.utils.color as color
2628
from renku.core.util.communication import CommunicationCallback
@@ -93,6 +95,12 @@ def finalize_progress(self, name):
9395
self._progress_bars[name].close()
9496
del self._progress_bars[name]
9597

98+
@contextmanager
99+
def busy(self, msg):
100+
"""Indicate busy status using a spinner."""
101+
with yaspin(text=msg):
102+
yield
103+
96104

97105
class ClickCallback(StandardOutput):
98106
"""CommunicationCallback implementation for ``click`` messages."""

0 commit comments

Comments
 (0)