Skip to content

Commit

Permalink
Merge pull request #10 from keyko-io/feature/update-to-remove-secret-…
Browse files Browse the repository at this point in the history
…store

Feature/update to remove secret store
  • Loading branch information
Enrique Ruiz committed May 15, 2020
2 parents 2330041 + d98558d commit bb9530b
Show file tree
Hide file tree
Showing 112 changed files with 22,474 additions and 179 deletions.
3 changes: 1 addition & 2 deletions .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.2.0
current_version = 0.3.0
commit = True
tag = True

Expand All @@ -14,4 +14,3 @@ replace = __version__ = '{new_version}'
[bumpversion:file:docs/source/conf.py]
search = {current_version}
replace = {new_version}

4 changes: 2 additions & 2 deletions .github/workflows/pythonpackage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.6, 3.7]
python-version: [3.7]

steps:
- uses: actions/checkout@v2
Expand All @@ -28,7 +28,7 @@ jobs:
git clone https://github.com/keyko-io/nevermined-tools
cd nevermined-tools
rm -rf "${HOME}/.nevermined/nevermined-contracts/artifacts"
bash -x start_nevermined.sh --no-commons --no-gateway --no-faucet --no-dashboard --latest 2>&1 > start_nevermined.log &
bash -x start_nevermined.sh --no-commons --no-faucet --no-dashboard --latest 2>&1 > start_nevermined.log &
cd ..
for i in $(seq 1 50); do
sleep 5
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ docker/docs
/config_local.ini
/artifacts
sdk.db
consume-downloads
access-downloads
.log
start_nevermined.log
errors.log.*
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
History
=======

0.3.0 (May, 2020)
-------------------------
* [#10](https://github.com/keyko-io/nevermined-sdk-py/pull/10) Support new authorization methods and use new gateway endpoint for access
* [#9](https://github.com/keyko-io/nevermined-sdk-py/pull/9) Add docs in github pages
* [#8](https://github.com/keyko-io/nevermined-sdk-py/pull/8) Upgrade web3py library to last version
* [#6](https://github.com/keyko-io/nevermined-sdk-py/issues/6) Implementation of the new flow

0.2.0 (April, 2020)
-------------------------

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ account = Account(config.parity_address, config.parity_password)
# Let's start by registering an asset in the Nevermined network
metadata = Metadata.get_example()

# consume and service endpoints require `gateway.url` is set in the config file
# access and service endpoints require `gateway.url` is set in the config file
# or passed to Nevermined instance in the config_dict.
# define the services to include in the new asset DDO

Expand All @@ -84,7 +84,7 @@ asset_ddo = nevermined.assets.search('Nevermined protocol')[0]
# Need some ocean tokens to be able to order assets
nevermined.accounts.request_tokens(account, 10)

# Start the purchase/consume request. This will automatically make a payment from the specified account.
# Start the purchase/access request. This will automatically make a payment from the specified account.
consumer_account = nevermined.accounts.list()[1]
service_agreement_id = nevermined.assets.order(asset_ddo.did, 0, consumer_account)

Expand Down Expand Up @@ -124,7 +124,7 @@ config_dict = {
# points to the local database file used for storing temporary information (for instance, pending service agreements).
'storage.path': 'sdk.db',
# Where to store downloaded asset files
'downloads.path': 'consume-downloads'
'downloads.path': 'access-downloads'
}
}

Expand Down
4 changes: 4 additions & 0 deletions docs/.buildinfo
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
config: b9639e57cd9f6513631d2113794143c6
tags: 645f666f9bcd5a90fca523b33c5a78b7
7 changes: 7 additions & 0 deletions docs/_sources/api/modules.rst.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
nevermined_sdk_py
=================

.. toctree::
:maxdepth: 4

nevermined_sdk_py
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
nevermined\_sdk\_py.agreement\_events.accessSecretStore module
==============================================================

.. automodule:: nevermined_sdk_py.agreement_events.accessSecretStore
:members:
:undoc-members:
:show-inheritance:
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
nevermined\_sdk\_py.agreement\_events.computeExecution module
=============================================================

.. automodule:: nevermined_sdk_py.agreement_events.computeExecution
:members:
:undoc-members:
:show-inheritance:
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
nevermined\_sdk\_py.agreement\_events.escrowAccessSecretStoreTemplate module
============================================================================

.. automodule:: nevermined_sdk_py.agreement_events.escrowAccessSecretStoreTemplate
:members:
:undoc-members:
:show-inheritance:
20 changes: 20 additions & 0 deletions docs/_sources/api/nevermined_sdk_py.agreement_events.rst.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
nevermined\_sdk\_py.agreement\_events package
=============================================

Submodules
----------

.. toctree::
:maxdepth: 4

nevermined_sdk_py.agreement_events.accessSecretStore
nevermined_sdk_py.agreement_events.computeExecution
nevermined_sdk_py.agreement_events.escrowAccessSecretStoreTemplate

Module contents
---------------

.. automodule:: nevermined_sdk_py.agreement_events
:members:
:undoc-members:
:show-inheritance:
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
nevermined\_sdk\_py.assets.asset\_consumer module
=================================================

.. automodule:: nevermined_sdk_py.assets.asset_consumer
:members:
:undoc-members:
:show-inheritance:
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
nevermined\_sdk\_py.assets.asset\_executor module
=================================================

.. automodule:: nevermined_sdk_py.assets.asset_executor
:members:
:undoc-members:
:show-inheritance:
19 changes: 19 additions & 0 deletions docs/_sources/api/nevermined_sdk_py.assets.rst.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
nevermined\_sdk\_py.assets package
==================================

Submodules
----------

.. toctree::
:maxdepth: 4

nevermined_sdk_py.assets.asset_consumer
nevermined_sdk_py.assets.asset_executor

Module contents
---------------

.. automodule:: nevermined_sdk_py.assets
:members:
:undoc-members:
:show-inheritance:
7 changes: 7 additions & 0 deletions docs/_sources/api/nevermined_sdk_py.config.rst.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
nevermined\_sdk\_py.config module
=================================

.. automodule:: nevermined_sdk_py.config
:members:
:undoc-members:
:show-inheritance:
7 changes: 7 additions & 0 deletions docs/_sources/api/nevermined_sdk_py.config_provider.rst.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
nevermined\_sdk\_py.config\_provider module
===========================================

.. automodule:: nevermined_sdk_py.config_provider
:members:
:undoc-members:
:show-inheritance:
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
nevermined\_sdk\_py.data\_store.auth\_tokens module
===================================================

.. automodule:: nevermined_sdk_py.data_store.auth_tokens
:members:
:undoc-members:
:show-inheritance:
18 changes: 18 additions & 0 deletions docs/_sources/api/nevermined_sdk_py.data_store.rst.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
nevermined\_sdk\_py.data\_store package
=======================================

Submodules
----------

.. toctree::
:maxdepth: 4

nevermined_sdk_py.data_store.auth_tokens

Module contents
---------------

.. automodule:: nevermined_sdk_py.data_store
:members:
:undoc-members:
:show-inheritance:
7 changes: 7 additions & 0 deletions docs/_sources/api/nevermined_sdk_py.gateway.gateway.rst.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
nevermined\_sdk\_py.gateway.gateway module
==========================================

.. automodule:: nevermined_sdk_py.gateway.gateway
:members:
:undoc-members:
:show-inheritance:
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
nevermined\_sdk\_py.gateway.gateway\_provider module
====================================================

.. automodule:: nevermined_sdk_py.gateway.gateway_provider
:members:
:undoc-members:
:show-inheritance:
19 changes: 19 additions & 0 deletions docs/_sources/api/nevermined_sdk_py.gateway.rst.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
nevermined\_sdk\_py.gateway package
===================================

Submodules
----------

.. toctree::
:maxdepth: 4

nevermined_sdk_py.gateway.gateway
nevermined_sdk_py.gateway.gateway_provider

Module contents
---------------

.. automodule:: nevermined_sdk_py.gateway
:members:
:undoc-members:
:show-inheritance:
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
nevermined\_sdk\_py.nevermined.accounts module
==============================================

.. automodule:: nevermined_sdk_py.nevermined.accounts
:members:
:undoc-members:
:show-inheritance:
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
nevermined\_sdk\_py.nevermined.agreements module
================================================

.. automodule:: nevermined_sdk_py.nevermined.agreements
:members:
:undoc-members:
:show-inheritance:
7 changes: 7 additions & 0 deletions docs/_sources/api/nevermined_sdk_py.nevermined.assets.rst.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
nevermined\_sdk\_py.nevermined.assets module
============================================

.. automodule:: nevermined_sdk_py.nevermined.assets
:members:
:undoc-members:
:show-inheritance:
7 changes: 7 additions & 0 deletions docs/_sources/api/nevermined_sdk_py.nevermined.auth.rst.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
nevermined\_sdk\_py.nevermined.auth module
==========================================

.. automodule:: nevermined_sdk_py.nevermined.auth
:members:
:undoc-members:
:show-inheritance:
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
nevermined\_sdk\_py.nevermined.conditions module
================================================

.. automodule:: nevermined_sdk_py.nevermined.conditions
:members:
:undoc-members:
:show-inheritance:
7 changes: 7 additions & 0 deletions docs/_sources/api/nevermined_sdk_py.nevermined.keeper.rst.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
nevermined\_sdk\_py.nevermined.keeper module
============================================

.. automodule:: nevermined_sdk_py.nevermined.keeper
:members:
:undoc-members:
:show-inheritance:
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
nevermined\_sdk\_py.nevermined.nevermined module
================================================

.. automodule:: nevermined_sdk_py.nevermined.nevermined
:members:
:undoc-members:
:show-inheritance:
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
nevermined\_sdk\_py.nevermined.providers module
===============================================

.. automodule:: nevermined_sdk_py.nevermined.providers
:members:
:undoc-members:
:show-inheritance:
29 changes: 29 additions & 0 deletions docs/_sources/api/nevermined_sdk_py.nevermined.rst.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
nevermined\_sdk\_py.nevermined package
======================================

Submodules
----------

.. toctree::
:maxdepth: 4

nevermined_sdk_py.nevermined.accounts
nevermined_sdk_py.nevermined.agreements
nevermined_sdk_py.nevermined.assets
nevermined_sdk_py.nevermined.auth
nevermined_sdk_py.nevermined.conditions
nevermined_sdk_py.nevermined.keeper
nevermined_sdk_py.nevermined.nevermined
nevermined_sdk_py.nevermined.providers
nevermined_sdk_py.nevermined.secret_store
nevermined_sdk_py.nevermined.services
nevermined_sdk_py.nevermined.templates
nevermined_sdk_py.nevermined.tokens

Module contents
---------------

.. automodule:: nevermined_sdk_py.nevermined
:members:
:undoc-members:
:show-inheritance:
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
nevermined\_sdk\_py.nevermined.secret\_store module
===================================================

.. automodule:: nevermined_sdk_py.nevermined.secret_store
:members:
:undoc-members:
:show-inheritance:
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
nevermined\_sdk\_py.nevermined.services module
==============================================

.. automodule:: nevermined_sdk_py.nevermined.services
:members:
:undoc-members:
:show-inheritance:
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
nevermined\_sdk\_py.nevermined.templates module
===============================================

.. automodule:: nevermined_sdk_py.nevermined.templates
:members:
:undoc-members:
:show-inheritance:
7 changes: 7 additions & 0 deletions docs/_sources/api/nevermined_sdk_py.nevermined.tokens.rst.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
nevermined\_sdk\_py.nevermined.tokens module
============================================

.. automodule:: nevermined_sdk_py.nevermined.tokens
:members:
:undoc-members:
:show-inheritance:

0 comments on commit bb9530b

Please sign in to comment.