Skip to content

Commit

Permalink
Upgrade to ocean_lib 0.5.22
Browse files Browse the repository at this point in the history
  • Loading branch information
David Hunt-Mateo committed May 21, 2021
1 parent 79de2a4 commit 4fb501b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 15 deletions.
15 changes: 1 addition & 14 deletions ocean_provider/utils/basics.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
# SPDX-License-Identifier: Apache-2.0
#
import os
import site

import requests
from ocean_lib.common.aquarius.aquarius import Aquarius
Expand All @@ -16,18 +15,6 @@
from requests_testadapter import Resp


def get_artifacts_path(config):
path = config.artifacts_path
if not path or not os.path.exists(path):
if os.getenv("VIRTUAL_ENV"):
path = os.path.join(os.getenv("VIRTUAL_ENV"), "artifacts")
else:
path = os.path.join(site.PREFIXES[0], "artifacts")

print(f"get_artifacts_path: {config.artifacts_path}, {path}, {site.PREFIXES[0]}")
return path


def get_config():
config_file = os.getenv("CONFIG_FILE", "config.ini")
return Config(filename=config_file)
Expand All @@ -54,7 +41,7 @@ def get_datatoken_minter(asset, datatoken_address):
def setup_network(config_file=None):
config = Config(filename=config_file) if config_file else get_config()
network_url = config.network_url
artifacts_path = get_artifacts_path(config)
artifacts_path = config.artifacts_path

ContractHandler.set_artifacts_path(artifacts_path)
w3_connection_provider = get_web3_connection_provider(network_url)
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"osmosis-on-premise-driver==0.1.0",
"osmosis-ipfs-driver==0.1.0",
"Werkzeug>=0.15.3",
"ocean-lib>=0.5.20",
"ocean-lib>=0.5.22",
"requests_testadapter",
"eciespy",
"coincurve>=13,<15",
Expand Down

0 comments on commit 4fb501b

Please sign in to comment.