From 8c1a547843f2916818beac5fdcfad547f0785ee0 Mon Sep 17 00:00:00 2001 From: Jiri Kuncar Date: Tue, 25 Sep 2018 17:16:42 +0200 Subject: [PATCH] release: v0.2.0 --- CHANGES.rst | 4 +- Pipfile.lock | 100 ++++++++++++++++++--------------------- renku/api/repository.py | 4 +- renku/models/commit.py | 9 ++-- renku/models/datasets.py | 2 +- renku/version.py | 2 +- setup.py | 8 ++-- snap/snapcraft.yaml | 4 +- tests/test_dataset.py | 10 ++-- 9 files changed, 69 insertions(+), 74 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index f01e10921e..07f389339a 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,5 +1,5 @@ .. - Copyright 2017 - Swiss Data Science Center (SDSC) + Copyright 2017-2018 - Swiss Data Science Center (SDSC) A partnership between École Polytechnique Fédérale de Lausanne (EPFL) and Eidgenössische Technische Hochschule Zürich (ETHZ). @@ -18,7 +18,7 @@ Changes ======= -Version 0.2.0rc1 (released 2018-08-23) +Version 0.2.0 (released 2018-09-25) - Refactored version using Git and Common Workflow Language. diff --git a/Pipfile.lock b/Pipfile.lock index 15f38cbb50..6d376bb5b4 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -18,10 +18,10 @@ "default": { "attrs": { "hashes": [ - "sha256:4b90b09eeeb9b88c35bc642cbac057e45a5fd85367b985bd2809c62b7b939265", - "sha256:e0d0eb91441a3b53dab4d9b743eafc1ac44476296a2053b6ca3af0b139faf87b" + "sha256:10cbf6e27dbce8c30807caf056c8eb50917e0eaafe86347671b57254006c3e69", + "sha256:ca4be454458f9dec299268d472aaa5a11f67a4ff70093396e1ceae9c76cf4bbb" ], - "version": "==18.1.0" + "version": "==18.2.0" }, "avro-cwl": { "hashes": [ @@ -66,12 +66,6 @@ ], "version": "==6.7" }, - "click-plugins": { - "hashes": [ - "sha256:7acc5e7eedd2dfd719714e8d53ae99030b5357aed661d0b06dacd6c2d583d7c5" - ], - "version": "==1.0.3" - }, "cwltool": { "hashes": [ "sha256:4e35255551670936d65b81bb4efcbb017eecb21449afa6af733700252dda6b27", @@ -95,10 +89,10 @@ }, "filelock": { "hashes": [ - "sha256:59ccab92fe118da7e5ce5a9fcd95506ade58d9d5f606db4922192524edfac820", - "sha256:5a090561e2ff3639c99205ea243d765da7aa4e6c425a3634259d2b6a23aa3145" + "sha256:43531c580b8ad7bc830b5ea921b6aca8197d2d982b67b940359d9b4d546e5a9a", + "sha256:e2631e0beb9b3095510c2c25b10a5f3011f65e8d6ff9a145799a27d03dfa70ee" ], - "version": "==3.0.6" + "version": "==3.0.8" }, "future": { "hashes": [ @@ -144,38 +138,38 @@ }, "lxml": { "hashes": [ - "sha256:0cf1eca0652c4409e0655e04b840d6d85b7eb18718f5fba3862acad5500e3480", - "sha256:10624ef1b468252309f269b13af4f837e3a82be366b5f3e49b0e83f1ad66205f", - "sha256:1259e374da3a575615fe402e0966c5894bae3d2e229c2239ba4ebf2bb020c4b6", - "sha256:26bb748af1ead0097eb8272b8a06f15a0015b8f312eef772a95f223a16e7de56", - "sha256:27d0b13bcfcf2f6a5664e64fc3d684c76db1cdba5a5761795d154063559e0b59", - "sha256:2b013fdabcbc21bc2770437099b921ec290235752b5baaac7a601f75094a378d", - "sha256:2e469ea2c0b722b9b393187649e7d126c537a68512fc92a676fe86e57050c2a9", - "sha256:37f7c2cdf513a0ea239c1609681880fb2f0073de0d2996e0ae9a7f0ef15d8b95", - "sha256:68c6afc7a4411db2df28307e2493c945cb3d887e8f431b81811c1ea6ba087b8b", - "sha256:73fe3452fc02c0b418914f842f897bdad0f1184368d8d9c315294ff7b94946f2", - "sha256:7584d83d7315f641510e5f97f4d636ea225fd76e3f8aee965b2e8c93a8169b4d", - "sha256:76e3ec6b26b1198dd5e6e20539d8360dcd3b224cd80cadba9307b790fda79161", - "sha256:8288a889cbaa446e5fa168837456e63098b91953c89e5857968a5091b337cdca", - "sha256:ad9e1fee284dec97b74cd88e925eca1575145598c974243cfb5e859f406adc32", - "sha256:b360c3769cf0fd7d82577e40e37d4caf693f67744d0d61d11d66b5c31eaccf7a", - "sha256:c4aaf320284a2713428163bae0e7df0db3b489237ab4830179210a12d56d3068", - "sha256:c530274e43b0f376cd94e8e0a3e6ea28de1739ec4326689bdbf626e172d2e614", - "sha256:ca4e79294fd0f3f9e0e5a4c309df84b5f2abc62349bfaf2aaf8965e5108ef8e2", - "sha256:ce2dc5a104e885abbd48d0cc92ae74afa1d685ee65d6e3497067207d6a26e177", - "sha256:d295cac30d3e13e82473081ea7df2a11352b5625cb54187fcd5a8be5d9ebf315", - "sha256:d498338b39c4757ba88bdc705b3a0647d18554856cd2d394ac3bb919ac890c9d", - "sha256:d537f8e613074805e17039e345edaa822534f66f07d315c89cff9824aa996d65", - "sha256:df8ba3f52ef59a553b0e94593ea526c34faa4f531c1ab7f5ca7f392bc770c9e3", - "sha256:e2553800d2d461a2dc329682d0a9068f238ec11d763e5454c61c4df7a0346ed2", - "sha256:e2afbe403090f5893e254958d02875e0732975e73c4c0cdd33c1f009a61963ca", - "sha256:e740efa625883f3c4de20c7e1411228d7ce2ab47b9e874a703f6681ec0558a30", - "sha256:ec7864b62da0f5ae44973351247f2250a25b9b544fc6aff8bd6a75da1156cc70", - "sha256:f26ddab491b10279b7e8e3fdcbaaaba3ab282fbaecfa48a19874dfc4d53b9d4f", - "sha256:f6a16681f30918521066ddcc4ba79c1e033c9837dd94f78f5a9f6110e7572185", - "sha256:f968623ac9b81a6253d4bbbe3f4d1e6be5f33707f397b566935783511bfa281a" - ], - "version": "==4.2.4" + "sha256:02bc220d61f46e9b9d5a53c361ef95e9f5e1d27171cd461dddb17677ae2289a5", + "sha256:22f253b542a342755f6cfc047fe4d3a296515cf9b542bc6e261af45a80b8caf6", + "sha256:2f31145c7ff665b330919bfa44aacd3a0211a76ca7e7b441039d2a0b0451e415", + "sha256:36720698c29e7a9626a0dc802ef8885f8f0239bfd1689628ecd459a061f2807f", + "sha256:438a1b0203545521f6616132bfe0f4bca86f8a401364008b30e2b26ec408ce85", + "sha256:4815892904c336bbaf73dafd54f45f69f4021c22b5bad7332176bbf4fb830568", + "sha256:5be031b0f15ad63910d8e5038b489d95a79929513b3634ad4babf77100602588", + "sha256:5c93ae37c3c588e829b037fdfbd64a6e40c901d3f93f7beed6d724c44829a3ad", + "sha256:60842230678674cdac4a1cf0f707ef12d75b9a4fc4a565add4f710b5fcf185d5", + "sha256:62939a8bb6758d1bf923aa1c13f0bcfa9bf5b2fc0f5fa917a6e25db5fe0cfa4e", + "sha256:75830c06a62fe7b8fe3bbb5f269f0b308f19f3949ac81cfd40062f47c1455faf", + "sha256:81992565b74332c7c1aff6a913a3e906771aa81c9d0c68c68113cffcae45bc53", + "sha256:8c892fb0ee52c594d9a7751c7d7356056a9682674b92cc1c4dc968ff0f30c52f", + "sha256:9d862e3cf4fc1f2837dedce9c42269c8c76d027e49820a548ac89fdcee1e361f", + "sha256:a623965c086a6e91bb703d4da62dabe59fe88888e82c4117d544e11fd74835d6", + "sha256:a7783ab7f6a508b0510490cef9f857b763d796ba7476d9703f89722928d1e113", + "sha256:aab09fbe8abfa3b9ce62aaf45aca2d28726b1b9ee44871dbe644050a2fff4940", + "sha256:abf181934ac3ef193832fb973fd7f6149b5c531903c2ec0f1220941d73eee601", + "sha256:ae07fa0c115733fce1e9da96a3ac3fa24801742ca17e917e0c79d63a01eeb843", + "sha256:b9c78242219f674ab645ec571c9a95d70f381319a23911941cd2358a8e0521cf", + "sha256:bccb267678b870d9782c3b44d0cefe3ba0e329f9af8c946d32bf3778e7a4f271", + "sha256:c4df4d27f4c93b2cef74579f00b1d3a31a929c7d8023f870c4b476f03a274db4", + "sha256:caf0e50b546bb60dfa99bb18dfa6748458a83131ecdceaf5c071d74907e7e78a", + "sha256:d3266bd3ac59ac4edcd5fa75165dee80b94a3e5c91049df5f7c057ccf097551c", + "sha256:db0d213987bcd4e6d41710fb4532b22315b0d8fb439ff901782234456556aed1", + "sha256:dbbd5cf7690a40a9f0a9325ab480d0fccf46d16b378eefc08e195d84299bfae1", + "sha256:e16e07a0ec3a75b5ee61f2b1003c35696738f937dc8148fbda9fe2147ccb6e61", + "sha256:e175a006725c7faadbe69e791877d09936c0ef2cf49d01b60a6c1efcb0e8be6f", + "sha256:edd9c13a97f6550f9da2236126bb51c092b3b1ce6187f2bd966533ad794bbb5e", + "sha256:fa39ea60d527fbdd94215b5e5552f1c6a912624521093f1384a491a8ad89ad8b" + ], + "version": "==4.2.5" }, "mistune": { "hashes": [ @@ -195,9 +189,9 @@ }, "networkx": { "hashes": [ - "sha256:64272ca418972b70a196cb15d9c85a5a6041f09a2f32e0d30c0255f25d458bb1" + "sha256:45e56f7ab6fe81652fb4bc9f44faddb0e9025f469f602df14e3b2551c2ea5c8b" ], - "version": "==2.1" + "version": "==2.2" }, "prov": { "hashes": [ @@ -235,10 +229,11 @@ }, "pyparsing": { "hashes": [ - "sha256:0832bcf47acd283788593e7a0f542407bd9550a55a8a8435214a1960e04bcb04", - "sha256:fee43f17a9c4087e7ed1605bd6df994c6173c1e977d7ade7b651292fab2bd010" + "sha256:905d8090c335314568b5faee0025b1829f27bb974604a5762a6cdef3a7dfc3b7", + "sha256:f493ee323be1e94929416b3585eefcc04943115cecbaaa35a8c86d1a2368af19" ], - "version": "==2.2.0" + "markers": "python_version != '3.1.*' and python_version != '3.0.*' and python_version >= '2.6' and python_version != '3.2.*'", + "version": "==2.2.1" }, "python-dateutil": { "hashes": [ @@ -317,11 +312,10 @@ }, "schema-salad": { "hashes": [ - "sha256:0f18f2c246aab921032096d1812768cf61d276a2a31230b360af2c003a7eb285", - "sha256:f5e20c2892c55bb5fb0d62745181dc7675087b46ff091c5fea998bbe4d54ae39" + "sha256:7bf995a5a34aac49adb2e2f6b1b926afcb21507481371f4227538ebd463d80b1", + "sha256:cce7ce1383cc0baa81ed6195b227e7da07b51e0fcd6ed697e693fbecf6ce0d5a" ], - "markers": "python_version != '3.2.*' and python_version != '3.1.*' and python_version != '3.3.*' and python_version < '4' and python_version != '3.0.*' and python_version >= '2.6'", - "version": "==2.7.20180809223002" + "version": "==2.7.20180905124720" }, "shellescape": { "hashes": [ diff --git a/renku/api/repository.py b/renku/api/repository.py index b312d25a58..6ad78f4613 100644 --- a/renku/api/repository.py +++ b/renku/api/repository.py @@ -231,8 +231,8 @@ def init_repository( gitignore.write( '\n' + str( - self.renku_path.relative_to(self.path) - .with_suffix(self.LOCK_SUFFIX) + self.renku_path.relative_to(self.path). + with_suffix(self.LOCK_SUFFIX) ) + '\n' ) diff --git a/renku/models/commit.py b/renku/models/commit.py index 351e089437..17936943a8 100644 --- a/renku/models/commit.py +++ b/renku/models/commit.py @@ -112,8 +112,9 @@ def iter_nodes(self, expand_workflow=True): ), 'tool': subprocess, 'workflow_path': - '{workflow_path}#steps/{step.id}' - .format(workflow_path=workflow_path, step=step), + '{workflow_path}#steps/{step.id}'.format( + workflow_path=workflow_path, step=step + ), } data.update(**default_data) yield (str(self.commit), path), data @@ -264,8 +265,8 @@ def from_git_commit(cls, commit, client, submodules=None): from git import Submodule submodules = [ - submodule for submodule in - Submodule.iter_items(client.git, parent_commit=commit) + submodule for submodule in Submodule. + iter_items(client.git, parent_commit=commit) ] except (RuntimeError, ValueError): # There are no submodules assiciated with the given commit. diff --git a/renku/models/datasets.py b/renku/models/datasets.py index 5a054ee7d8..d891eb9003 100644 --- a/renku/models/datasets.py +++ b/renku/models/datasets.py @@ -164,7 +164,7 @@ class Dataset(object): SUPPORTED_SCHEMES = ('', 'file', 'http', 'https') - name = jsonld.ib(type='string', context='dcterms:name') + name = jsonld.ib(type=str, context='dcterms:name') created = jsonld.ib( converter=_parse_date, diff --git a/renku/version.py b/renku/version.py index 9b662e5f66..98c3e213b2 100644 --- a/renku/version.py +++ b/renku/version.py @@ -23,4 +23,4 @@ from __future__ import absolute_import, print_function -__version__ = '0.2.0rc2.dev20180824' +__version__ = '0.2.0' diff --git a/setup.py b/setup.py index b09b3585d9..444bb6adef 100644 --- a/setup.py +++ b/setup.py @@ -38,7 +38,7 @@ 'pytest-yapf>=0.1.1', 'pytest>=3.6.3,!=3.7.3', 'responses>=0.7.0', - 'yapf>=0.22.0', + 'yapf>=0.24.0', ] extras_require = { @@ -64,15 +64,15 @@ install_requires = [ 'PyYAML>=3.12', - 'attrs>=17.4.0', + 'attrs>=18.2.0', 'click>=6.7', - 'cwltool>=1.0.20180820141117', + 'cwltool==1.0.20180820141117', 'environ_config>=18.2.0', 'filelock>=3.0.0', 'gitpython>=2.1.8', 'networkx>=2.1', 'pydot>=1.2.4', - 'pyld>=0.8.2', + 'pyld>=1.0.3', 'python-dateutil>=2.6.1', 'requests>=2.18.4', 'tabulate>=0.7.7', diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index d49c9fc395..49b69ac684 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -17,14 +17,14 @@ # limitations under the License. name: renku -version: '0.2.0rc1' +version: '0.2.0' summary: A Python library for the Renku collaborative data science platform. description: | A Python library for the Renku collaborative data science platform. It allows the user to create projects, manage datasets, and capture data provenance while performing analysis tasks. -grade: devel # must be 'stable' to release into candidate/stable channels +grade: stable # must be 'stable' to release into candidate/stable channels confinement: strict # use 'strict' once you have the right plugs and slots apps: diff --git a/tests/test_dataset.py b/tests/test_dataset.py index 6d0257fef7..2848ba7601 100644 --- a/tests/test_dataset.py +++ b/tests/test_dataset.py @@ -46,11 +46,11 @@ def not_raises(): @pytest.mark.parametrize( - 'scheme, path, error', - [('', 'temp', None), ('file://', 'temp', None), - ('', 'tempp', git.NoSuchPathError), ('http://', 'example.com/file', None), - ('https://', 'example.com/file', None), - ('bla://', 'file', NotImplementedError)] + 'scheme, path, error', [('', 'temp', None), ('file://', 'temp', None), + ('', 'tempp', git.NoSuchPathError), + ('http://', 'example.com/file', None), + ('https://', 'example.com/file', None), + ('bla://', 'file', NotImplementedError)] ) def test_data_add( scheme, path, error, client, data_file, directory_tree, dataset_responses