Skip to content

Commit 659baf1

Browse files
authored
chore: release v1.3.0 (#2917)
1 parent 11f753c commit 659baf1

Some content is hidden

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

80 files changed

+3797
-1112
lines changed

.github/workflows/github-project.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: Add PR and Issues to project
2+
on:
3+
pull_request:
4+
types:
5+
- opened
6+
issues:
7+
types:
8+
- opened
9+
jobs:
10+
add_to_project:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/add-to-project@main
14+
with:
15+
project-url: https://github.com/orgs/SwissDataScienceCenter/projects/45
16+
github-token: ${{ secrets.RENKUBOT_GITHUB_TOKEN }}

.github/workflows/test_deploy.yml

Lines changed: 63 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,15 @@ 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
67+
python -m pip install coveralls poetry wheel twine poetry-dynamic-versioning
68+
poetry-dynamic-versioning
6869
make download-templates
6970
python -m pip install .[all]
7071
- name: Install renku into cache
7172
if: steps.dependency-cache.outputs.cache-hit == 'true'
72-
run: python -m pip install --no-deps .
73+
run: |
74+
poetry-dynamic-versioning
75+
python -m pip install --no-deps .
7376
- name: Set Git config
7477
run: |
7578
git config --global --add user.name "Renku Bot"
@@ -103,12 +106,15 @@ jobs:
103106
if: steps.dependency-cache.outputs.cache-hit != 'true' || 'refs/heads/master' == github.ref || 'refs/heads/develop' == github.ref || startsWith(github.ref, 'refs/tags/')
104107
run: |
105108
python -m pip install --upgrade pip
106-
python -m pip install coveralls poetry wheel twine
109+
python -m pip install coveralls poetry wheel twine poetry-dynamic-versioning
110+
poetry-dynamic-versioning
107111
make download-templates
108112
python -m pip install .[all]
109113
- name: Install renku into cache
110114
if: steps.dependency-cache.outputs.cache-hit == 'true'
111-
run: python -m pip install --no-deps .
115+
run: |
116+
poetry-dynamic-versioning
117+
python -m pip install --no-deps .
112118
- name: Set Git config
113119
run: |
114120
git config --global --add user.name "Renku Bot"
@@ -139,12 +145,15 @@ jobs:
139145
if: steps.dependency-cache.outputs.cache-hit != 'true' || 'refs/heads/master' == github.ref || 'refs/heads/develop' == github.ref || startsWith(github.ref, 'refs/tags/')
140146
run: |
141147
python -m pip install --upgrade pip
142-
python -m pip install coveralls poetry wheel twine
148+
python -m pip install coveralls poetry wheel twine poetry-dynamic-versioning
149+
poetry-dynamic-versioning
143150
make download-templates
144151
python -m pip install .[all]
145152
- name: Install renku into cache
146153
if: steps.dependency-cache.outputs.cache-hit == 'true'
147-
run: python -m pip install --no-deps .
154+
run: |
155+
poetry-dynamic-versioning
156+
python -m pip install --no-deps .
148157
- name: Set Git config
149158
run: |
150159
git config --global --add user.name "Renku Bot"
@@ -181,11 +190,14 @@ jobs:
181190
if: steps.cache.outputs.cache-hit != 'true'
182191
run: |
183192
python -m pip install --upgrade pip
184-
python -m pip install coveralls poetry wheel twine
193+
python -m pip install coveralls poetry wheel twine poetry-dynamic-versioning
194+
poetry-dynamic-versioning
185195
python -m pip install .[all]
186196
- name: Install renku into cache
187197
if: steps.cache.outputs.cache-hit == 'true'
188-
run: python -m pip install --no-deps .
198+
run: |
199+
poetry-dynamic-versioning
200+
python -m pip install --no-deps .
189201
- name: Set Git config
190202
run: |
191203
git config --global --add user.name "Renku Bot"
@@ -199,7 +211,7 @@ jobs:
199211
cd ../..
200212
- name: Publish cheatsheet if changed
201213
id: publish
202-
if: ${{ hashFiles('docs/cheatsheet_hash') != hashFiles('docs/cheatsheet_hash_new') }}
214+
if: ${{ hashFiles('docs/cheatsheet_hash') != hashFiles('docs/cheatsheet_hash_new') }}
203215
run: |
204216
cat docs/cheatsheet_hash
205217
cat docs/cheatsheet_hash_new
@@ -238,12 +250,15 @@ jobs:
238250
if: steps.dependency-cache.outputs.cache-hit != 'true' || 'refs/heads/master' == github.ref || 'refs/heads/develop' == github.ref || startsWith(github.ref, 'refs/tags/')
239251
run: |
240252
python -m pip install --upgrade pip
241-
python -m pip install coveralls poetry wheel twine
253+
python -m pip install coveralls poetry wheel twine poetry-dynamic-versioning
254+
poetry-dynamic-versioning
242255
make download-templates
243256
pip install .[all]
244257
- name: Install renku into cache
245258
if: steps.dependency-cache.outputs.cache-hit == 'true'
246-
run: python -m pip install --no-deps .
259+
run: |
260+
poetry-dynamic-versioning
261+
python -m pip install --no-deps .
247262
- name: Build Package
248263
env:
249264
POETRY_VIRTUALENVS_CREATE: false
@@ -281,12 +296,15 @@ jobs:
281296
if: steps.dependency-cache.outputs.cache-hit != 'true' || 'refs/heads/master' == github.ref || 'refs/heads/develop' == github.ref || startsWith(github.ref, 'refs/tags/')
282297
run: |
283298
python -m pip install --upgrade pip
284-
python -m pip install coveralls poetry wheel twine
299+
python -m pip install coveralls poetry wheel twine poetry-dynamic-versioning
300+
poetry-dynamic-versioning
285301
make download-templates
286302
python -m pip install .[all]
287303
- name: Install renku into cache
288304
if: steps.dependency-cache.outputs.cache-hit == 'true'
289-
run: python -m pip install --no-deps .
305+
run: |
306+
poetry-dynamic-versioning
307+
python -m pip install --no-deps .
290308
- name: Set Git config
291309
run: |
292310
git config --global --add user.name "Renku Bot"
@@ -336,12 +354,15 @@ jobs:
336354
if: steps.dependency-cache.outputs.cache-hit != 'true' || 'refs/heads/master' == github.ref || 'refs/heads/develop' == github.ref || startsWith(github.ref, 'refs/tags/')
337355
run: |
338356
python -m pip install --upgrade pip
339-
python -m pip install coveralls poetry wheel twine
357+
python -m pip install coveralls poetry wheel twine poetry-dynamic-versioning
358+
poetry-dynamic-versioning
340359
make download-templates
341360
python -m pip install .[all]
342361
- name: Install renku into cache
343362
if: steps.dependency-cache.outputs.cache-hit == 'true'
344-
run: python -m pip install --no-deps .
363+
run: |
364+
poetry-dynamic-versioning
365+
python -m pip install --no-deps .
345366
- name: Set Git config
346367
run: |
347368
git config --global --add user.name "Renku Bot"
@@ -397,12 +418,15 @@ jobs:
397418
if: steps.dependency-cache.outputs.cache-hit != 'true' || 'refs/heads/master' == github.ref || 'refs/heads/develop' == github.ref || startsWith(github.ref, 'refs/tags/')
398419
run: |
399420
python -m pip install --upgrade pip
400-
python -m pip install coveralls poetry wheel twine
421+
python -m pip install coveralls poetry wheel twine poetry-dynamic-versioning
422+
poetry-dynamic-versioning
401423
make download-templates
402424
python -m pip install .[all]
403425
- name: Install renku into cache
404426
if: steps.dependency-cache.outputs.cache-hit == 'true'
405-
run: python -m pip install --no-deps .
427+
run: |
428+
poetry-dynamic-versioning
429+
python -m pip install --no-deps .
406430
- name: Set Git config
407431
run: |
408432
git config --global --add user.name "Renku Bot"
@@ -458,12 +482,15 @@ jobs:
458482
if: steps.dependency-cache.outputs.cache-hit != 'true' || 'refs/heads/master' == github.ref || 'refs/heads/develop' == github.ref || startsWith(github.ref, 'refs/tags/')
459483
run: |
460484
python -m pip install --upgrade pip
461-
python -m pip install coveralls poetry wheel twine
485+
python -m pip install coveralls poetry wheel twine poetry-dynamic-versioning
486+
poetry-dynamic-versioning
462487
make download-templates
463488
python -m pip install .[all]
464489
- name: Install renku into cache
465490
if: steps.dependency-cache.outputs.cache-hit == 'true'
466-
run: python -m pip install --no-deps .
491+
run: |
492+
poetry-dynamic-versioning
493+
python -m pip install --no-deps .
467494
- name: Set Git config
468495
run: |
469496
git config --global --add user.name "Renku Bot"
@@ -505,7 +532,8 @@ jobs:
505532
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
506533
brew install shellcheck node || brew link --overwrite node
507534
python -m pip install --upgrade pip
508-
python -m pip install wheel
535+
python -m pip install wheel poetry-dynamic-versioning
536+
poetry-dynamic-versioning
509537
make download-templates
510538
python -m pip install .[all]
511539
git config --global --add user.name "Renku Bot"
@@ -540,7 +568,8 @@ jobs:
540568
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
541569
brew install shellcheck node || brew link --overwrite node
542570
python -m pip install --upgrade pip
543-
python -m pip install wheel
571+
python -m pip install wheel poetry-dynamic-versioning
572+
poetry-dynamic-versioning
544573
make download-templates
545574
python -m pip install .[all]
546575
git config --global --add user.name "Renku Bot"
@@ -582,8 +611,9 @@ jobs:
582611
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
583612
brew install shellcheck node || brew link --overwrite node
584613
python -m pip install --upgrade pip
585-
python -m pip install wheel
614+
python -m pip install wheel poetry-dynamic-versioning
586615
make download-templates
616+
poetry-dynamic-versioning
587617
python -m pip install .[all]
588618
git config --global --add user.name "Renku Bot"
589619
git config --global --add user.email "[email protected]"
@@ -666,12 +696,15 @@ jobs:
666696
if: steps.dependency-cache.outputs.cache-hit != 'true' || 'refs/heads/master' == github.ref || 'refs/heads/develop' == github.ref || startsWith(github.ref, 'refs/tags/')
667697
run: |
668698
python -m pip install --upgrade pip
669-
python -m pip install coveralls poetry wheel twine
699+
python -m pip install coveralls poetry wheel twine poetry-dynamic-versioning
700+
poetry-dynamic-versioning
670701
make download-templates
671702
python -m pip install .[all]
672703
- name: Install renku into cache
673704
if: steps.dependency-cache.outputs.cache-hit == 'true'
674-
run: python -m pip install --no-deps .
705+
run: |
706+
poetry-dynamic-versioning
707+
python -m pip install --no-deps .
675708
- name: Set Git config
676709
run: |
677710
git config --global --add user.name "Renku Bot"
@@ -742,12 +775,15 @@ jobs:
742775
if: steps.dependency-cache.outputs.cache-hit != 'true' || 'refs/heads/master' == github.ref || 'refs/heads/develop' == github.ref || startsWith(github.ref, 'refs/tags/')
743776
run: |
744777
python -m pip install --upgrade pip
745-
python -m pip install coveralls poetry wheel twine
778+
python -m pip install coveralls poetry wheel twine poetry-dynamic-versioning
779+
poetry-dynamic-versioning
746780
make download-templates
747781
python -m pip install .[all]
748782
- name: Install renku into cache
749783
if: steps.dependency-cache.outputs.cache-hit == 'true'
750-
run: python -m pip install --no-deps .
784+
run: |
785+
poetry-dynamic-versioning
786+
python -m pip install --no-deps .
751787
- name: Set Git config
752788
run: |
753789
git config --global --add user.name "Renku Bot"
@@ -882,7 +918,7 @@ jobs:
882918
- uses: actions/checkout@v2
883919
with:
884920
fetch-depth: 0
885-
ref: 'develop'
921+
ref: "develop"
886922
- name: Set Git config
887923
run: |
888924
git config --global --add user.name "Renku Bot"

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ repos:
66
- id: end-of-file-fixer
77
- id: trailing-whitespace
88
- repo: https://github.com/psf/black
9-
rev: 22.1.0
9+
rev: 22.3.0
1010
hooks:
1111
- id: black
1212
additional_dependencies: ['click==8.0.4']

CHANGES.rst

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

21+
`1.3.0 <https://github.com/SwissDataScienceCenter/renku-python/compare/v1.2.4...v1.3.0>`__ (2022-05-20)
22+
-------------------------------------------------------------------------------------------------------
23+
24+
Bug Fixes
25+
~~~~~~~~~
26+
27+
- **cli:** add git user configuration to local session
28+
(`#2877 <https://github.com/SwissDataScienceCenter/renku-python/issues/2877>`__)
29+
(`089488b <https://github.com/SwissDataScienceCenter/renku-python/commit/089488b1e9d63ee88e96248be6d910836dbd1437>`__)
30+
- **service:** create dummy metadata.yml when creating a project for backwards compatibility
31+
(`#2901 <https://github.com/SwissDataScienceCenter/renku-python/issues/2901>`__)
32+
(`ddd757d <https://github.com/SwissDataScienceCenter/renku-python/commit/ddd757ddf3906985486cecc8790c8358487cb95c>`__)
33+
- **service:** clean up old scheduled jobs
34+
(`#2890 <https://github.com/SwissDataScienceCenter/renku-python/issues/2890>`__)
35+
(`396651a <https://github.com/SwissDataScienceCenter/renku-python/commit/396651a1b40b8aadc384b1e58ec8bea95fc5a61d>`__)
36+
- **service:** cleanup project when origin is out of sync
37+
(`#2878 <https://github.com/SwissDataScienceCenter/renku-python/issues/2878>`__)
38+
(`6f3387a <https://github.com/SwissDataScienceCenter/renku-python/commit/6f3387a8f14fd97707330efe7a97e865ca600cfa>`__),
39+
closes
40+
`#2826 <https://github.com/SwissDataScienceCenter/renku-python/issues/2826>`__
41+
42+
Features
43+
~~~~~~~~
44+
45+
- **api:** add plan support in Renku API
46+
(`#2909 <https://github.com/SwissDataScienceCenter/renku-python/issues/2909>`__)
47+
(`e6cb2d3 <https://github.com/SwissDataScienceCenter/renku-python/commit/e6cb2d3303c2dee35e38d892d48b415bb247e190>`__)
48+
- **api:** add project status support in Renku API
49+
(`#2893 <https://github.com/SwissDataScienceCenter/renku-python/issues/2893>`__)
50+
(`9d49de4 <https://github.com/SwissDataScienceCenter/renku-python/commit/9d49de4ea4161ed3553d58f688a813fac20c5683>`__)
51+
- **cli:** add a custom git merge tool for renku metadata
52+
(`#2867 <https://github.com/SwissDataScienceCenter/renku-python/issues/2867>`__)
53+
(`2021e76 <https://github.com/SwissDataScienceCenter/renku-python/commit/2021e761624da3269cf2109940fc86fd109a2032>`__)
54+
- **core:** add a minimum version check to support breaking forward
55+
compatibility
56+
(`#2840 <https://github.com/SwissDataScienceCenter/renku-python/issues/2840>`__)
57+
(`42dc84c <https://github.com/SwissDataScienceCenter/renku-python/commit/42dc84c5d9fc325fefa8f9e993b20b5dd9e9c966>`__)
58+
2159
`1.2.4 <https://github.com/SwissDataScienceCenter/renku-python/compare/v1.2.3...v1.2.4>`__ (2022-05-06)
2260
-------------------------------------------------------------------------------------------------------
2361

conftest.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,13 @@
6161
INCLUDE_FIXTURES = GLOBAL_FIXTURE_LOCATIONS + CORE_FIXTURE_LOCATIONS + CLI_FIXTURE_LOCATIONS + SERVICE_FIXTURE_LOCATIONS
6262

6363

64-
for _fixture in INCLUDE_FIXTURES:
65-
module = importlib.import_module(_fixture)
66-
globals().update(
67-
{n: getattr(module, n) for n in module.__all__}
68-
if hasattr(module, "__all__")
69-
else {k: v for (k, v) in module.__dict__.items() if not k.startswith("_")}
70-
)
64+
def pytest_configure(config):
65+
"""Run global setup before executing tests."""
66+
67+
for _fixture in INCLUDE_FIXTURES:
68+
module = importlib.import_module(_fixture)
69+
globals().update(
70+
{n: getattr(module, n) for n in module.__all__}
71+
if hasattr(module, "__all__")
72+
else {k: v for (k, v) in module.__dict__.items() if not k.startswith("_")}
73+
)

docs/cheatsheet/conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
4343
# ones.
4444
extensions = [
45+
"plantweb.directive",
4546
"sphinx.ext.autodoc",
4647
"sphinx_tabs.tabs",
4748
"sphinx.ext.napoleon",

docs/conf.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
4343
# ones.
4444
extensions = [
45+
"plantweb.directive",
4546
"sphinx.ext.autodoc",
4647
"sphinx.ext.coverage",
4748
"sphinx.ext.doctest",
@@ -359,7 +360,6 @@
359360
("py:class", "Path"),
360361
("py:class", "Persistent"),
361362
("py:class", "optional"),
362-
("py:class", "persistent.Persistent"),
363363
("py:class", '"LocalClient"'),
364364
("py:class", '"ValueResolver"'),
365365
("py:exc", "errors.ParameterError"),
@@ -369,5 +369,6 @@
369369
("py:class", r"calamus.*"),
370370
("py:class", r"docker.*"),
371371
("py:class", r"marshmallow.*"),
372+
("py:class", r"persistent.*"),
372373
("py:class", r"yaml.*"),
373374
]

docs/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
Getting Started <gettingstarted>
2626
How-to Guides <how-to-guides/index>
2727
Reference <reference/index>
28+
CLI Plugins <plugins>
2829

2930
.. raw:: html
3031

0 commit comments

Comments
 (0)