Bump version: 0.8.5 → 0.8.6 (#822)

- Bump version from 0.8.5 to 0.8 6
- Fix black CI check by backporting #691
  - Update .pre-commit-config.yaml using `pre-commit autoupdate`
  - Bind `black`, `isort`, `flake8`, and `licenseheaders` versions in `setup.py` to match `.pre-commit-config.yaml`
  - Update licenseheaders template to 2022
  - Run pre-commit checks on all files using `pre-commit run --all-files`
- Fix tox CI check by using v3 barge

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.8.5
+current_version = 0.8.6
 commit = True
 tag = True
 

.copyright.tmpl

@@ -1,2 +1,2 @@
-Copyright 2021 Ocean Protocol Foundation
+Copyright 2022 Ocean Protocol Foundation
 SPDX-License-Identifier: Apache-2.0

.github/workflows/black.yml

@@ -1,5 +1,5 @@
 ##
-## Copyright 2021 Ocean Protocol Foundation
+## Copyright 2022 Ocean Protocol Foundation
 ## SPDX-License-Identifier: Apache-2.0
 ##
 name: black

.github/workflows/release.yml

@@ -1,5 +1,5 @@
 ##
-## Copyright 2021 Ocean Protocol Foundation
+## Copyright 2022 Ocean Protocol Foundation
 ## SPDX-License-Identifier: Apache-2.0
 ##
 name: Ocean.py release

.github/workflows/tox.yml

@@ -1,5 +1,5 @@
 ##
-## Copyright 2021 Ocean Protocol Foundation
+## Copyright 2022 Ocean Protocol Foundation
 ## SPDX-License-Identifier: Apache-2.0
 ##
 name: Ocean.py tests
@@ -24,6 +24,7 @@ jobs:
         with:
           repository: "oceanprotocol/barge"
           path: 'barge'
+          ref: v3
       - name: Run Barge
         working-directory: ${{ github.workspace }}/barge
         env:

.pre-commit-config.yaml

@@ -1,18 +1,18 @@
 ##
-## Copyright 2021 Ocean Protocol Foundation
+## Copyright 2022 Ocean Protocol Foundation
 ## SPDX-License-Identifier: Apache-2.0
 ##
 repos:
--   repo: https://github.com/pre-commit/mirrors-isort
-    rev: v4.3.21
+-   repo: https://github.com/PyCQA/isort
+    rev: 5.10.1
     hooks:
     - id: isort
 -   repo: https://github.com/psf/black
-    rev: 19.3b0
+    rev: 22.1.0
     hooks:
     -   id: black
 -   repo: https://gitlab.com/pycqa/flake8
-    rev: 3.7.9
+    rev: 3.9.2
     hooks:
     - id: flake8
 -   repo: https://github.com/johann-petrak/licenseheaders.git

.prospector.yml

@@ -1,5 +1,5 @@
 ##
-## Copyright 2021 Ocean Protocol Foundation
+## Copyright 2022 Ocean Protocol Foundation
 ## SPDX-License-Identifier: Apache-2.0
 ##
 pep257:

CHANGELOG.md

@@ -1,5 +1,5 @@
 <!--
-Copyright 2021 Ocean Protocol Foundation
+Copyright 2022 Ocean Protocol Foundation
 SPDX-License-Identifier: Apache-2.0
 -->
 See [`releases`](https://github.com/oceanprotocol/ocean.py/releases).

README.md

@@ -1,5 +1,5 @@
 <!--
-Copyright 2021 Ocean Protocol Foundation
+Copyright 2022 Ocean Protocol Foundation
 SPDX-License-Identifier: Apache-2.0
 -->
 

READMEs/ALG_ddo.md

@@ -1,3 +1,7 @@
+<!--
+Copyright 2022 Ocean Protocol Foundation
+SPDX-License-Identifier: Apache-2.0
+-->
 (HACK to help debugging. Remove later)
 
 In Python console:

READMEs/DATA_ddo.md

@@ -1,3 +1,7 @@
+<!--
+Copyright 2022 Ocean Protocol Foundation
+SPDX-License-Identifier: Apache-2.0
+-->
 (HACK to help debugging. Remove later)
 
 In Python console:

READMEs/c2d-flow.md

@@ -1,5 +1,5 @@
 <!--
-Copyright 2021 Ocean Protocol Foundation
+Copyright 2022 Ocean Protocol Foundation
 SPDX-License-Identifier: Apache-2.0
 -->
 

READMEs/datatokens-flow.md

@@ -1,5 +1,5 @@
 <!--
-Copyright 2021 Ocean Protocol Foundation
+Copyright 2022 Ocean Protocol Foundation
 SPDX-License-Identifier: Apache-2.0
 -->
 

READMEs/developers.md

@@ -1,5 +1,5 @@
 <!--
-Copyright 2021 Ocean Protocol Foundation
+Copyright 2022 Ocean Protocol Foundation
 SPDX-License-Identifier: Apache-2.0
 -->
 

READMEs/dispenser-flow.md

@@ -1,5 +1,5 @@
 <!--
-Copyright 2021 Ocean Protocol Foundation
+Copyright 2022 Ocean Protocol Foundation
 SPDX-License-Identifier: Apache-2.0
 -->
 

READMEs/fixed-rate-exchange-flow.md

@@ -1,5 +1,5 @@
 <!--
-Copyright 2021 Ocean Protocol Foundation
+Copyright 2022 Ocean Protocol Foundation
 SPDX-License-Identifier: Apache-2.0
 -->
 

READMEs/get-test-OCEAN.md

@@ -1,5 +1,5 @@
 <!--
-Copyright 2021 Ocean Protocol Foundation
+Copyright 2022 Ocean Protocol Foundation
 SPDX-License-Identifier: Apache-2.0
 -->
 

READMEs/marketplace-flow.md

@@ -1,5 +1,5 @@
 <!--
-Copyright 2021 Ocean Protocol Foundation
+Copyright 2022 Ocean Protocol Foundation
 SPDX-License-Identifier: Apache-2.0
 -->
 

READMEs/overview.md

@@ -1,5 +1,5 @@
 <!--
-Copyright 2021 Ocean Protocol Foundation
+Copyright 2022 Ocean Protocol Foundation
 SPDX-License-Identifier: Apache-2.0
 -->
 

READMEs/parameters.md

@@ -1,5 +1,5 @@
 <!--
-Copyright 2021 Ocean Protocol Foundation
+Copyright 2022 Ocean Protocol Foundation
 SPDX-License-Identifier: Apache-2.0
 -->
 

READMEs/release-process.md

@@ -1,5 +1,5 @@
 <!--
-Copyright 2021 Ocean Protocol Foundation
+Copyright 2022 Ocean Protocol Foundation
 SPDX-License-Identifier: Apache-2.0
 -->
 

READMEs/services.md

@@ -1,5 +1,5 @@
 <!--
-Copyright 2021 Ocean Protocol Foundation
+Copyright 2022 Ocean Protocol Foundation
 SPDX-License-Identifier: Apache-2.0
 -->
 

READMEs/wallets.md

@@ -1,5 +1,5 @@
 <!--
-Copyright 2021 Ocean Protocol Foundation
+Copyright 2022 Ocean Protocol Foundation
 SPDX-License-Identifier: Apache-2.0
 -->
 

bumpversion.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 ##
-## Copyright 2021 Ocean Protocol Foundation
+## Copyright 2022 Ocean Protocol Foundation
 ## SPDX-License-Identifier: Apache-2.0
 ##
 

conftest.py

@@ -1,12 +1,13 @@
 #
-# Copyright 2021 Ocean Protocol Foundation
+# Copyright 2022 Ocean Protocol Foundation
 # SPDX-License-Identifier: Apache-2.0
 #
 import json
 import os
 import uuid
 
 import pytest
+
 from ocean_lib.common.aquarius.aquarius_provider import AquariusProvider
 from ocean_lib.web3_internal.currency import from_wei, to_wei
 from ocean_lib.web3_internal.transactions import send_ether

ocean_lib/__init__.py

@@ -1,11 +1,11 @@
 #
-# Copyright 2021 Ocean Protocol Foundation
+# Copyright 2022 Ocean Protocol Foundation
 # SPDX-License-Identifier: Apache-2.0
 #
 
 """Initialises ocean lib package."""
 
 __author__ = """OceanProtocol"""
 # fmt: off
-__version__ = '0.8.5'
+__version__ = '0.8.6'
 # fmt: on

ocean_lib/assets/__init__.py

@@ -1,4 +1,4 @@
 #
-# Copyright 2021 Ocean Protocol Foundation
+# Copyright 2022 Ocean Protocol Foundation
 # SPDX-License-Identifier: Apache-2.0
 #

ocean_lib/assets/asset.py

@@ -1,5 +1,5 @@
 #
-# Copyright 2021 Ocean Protocol Foundation
+# Copyright 2022 Ocean Protocol Foundation
 # SPDX-License-Identifier: Apache-2.0
 #
 import copy
@@ -11,6 +11,7 @@
 from enforce_typing import enforce_types
 from eth_account.account import Account
 from eth_utils import add_0x_prefix
+
 from ocean_lib.assets.credentials import AddressCredential
 from ocean_lib.assets.did import did_to_id
 from ocean_lib.common.agreements.consumable import ConsumableCodes

ocean_lib/assets/asset_downloader.py

@@ -1,5 +1,5 @@
 #
-# Copyright 2021 Ocean Protocol Foundation
+# Copyright 2022 Ocean Protocol Foundation
 # SPDX-License-Identifier: Apache-2.0
 #
 
@@ -8,6 +8,7 @@
 from typing import Optional, Type
 
 from enforce_typing import enforce_types
+
 from ocean_lib.assets.asset import V3Asset
 from ocean_lib.common.agreements.service_types import ServiceTypes
 from ocean_lib.data_provider.data_service_provider import DataServiceProvider

ocean_lib/assets/asset_resolver.py

@@ -1,5 +1,5 @@
 #
-# Copyright 2021 Ocean Protocol Foundation
+# Copyright 2022 Ocean Protocol Foundation
 # SPDX-License-Identifier: Apache-2.0
 #
 """DID Resolver module."""
@@ -10,10 +10,11 @@
 from typing import Optional
 
 from enforce_typing import enforce_types
+from web3.main import Web3
+
 from ocean_lib.assets.asset import V3Asset
 from ocean_lib.common.aquarius.aquarius_provider import AquariusProvider
 from ocean_lib.models.data_token import DataToken
-from web3.main import Web3
 
 logger = logging.getLogger("keeper")
 

ocean_lib/assets/credentials.py

@@ -1,10 +1,11 @@
 #
-# Copyright 2021 Ocean Protocol Foundation
+# Copyright 2022 Ocean Protocol Foundation
 # SPDX-License-Identifier: Apache-2.0
 #
 from typing import Optional
 
 from enforce_typing import enforce_types
+
 from ocean_lib.common.agreements.consumable import ConsumableCodes, MalformedCredential
 
 

ocean_lib/assets/did.py

@@ -1,5 +1,5 @@
 #
-# Copyright 2021 Ocean Protocol Foundation
+# Copyright 2022 Ocean Protocol Foundation
 # SPDX-License-Identifier: Apache-2.0
 #
 """DID Lib to do DID's and DDO's."""
@@ -8,9 +8,10 @@
 
 from enforce_typing import enforce_types
 from eth_utils import remove_0x_prefix
-from ocean_lib.utils.utilities import checksum
 from web3 import Web3
 
+from ocean_lib.utils.utilities import checksum
+
 OCEAN_PREFIX = "did:op:"
 
 

ocean_lib/assets/test/__init__.py

@@ -1,4 +1,4 @@
 #
-# Copyright 2021 Ocean Protocol Foundation
+# Copyright 2022 Ocean Protocol Foundation
 # SPDX-License-Identifier: Apache-2.0
 #

ocean_lib/assets/test/test_asset.py

@@ -1,5 +1,5 @@
 #
-# Copyright 2021 Ocean Protocol Foundation
+# Copyright 2022 Ocean Protocol Foundation
 # SPDX-License-Identifier: Apache-2.0
 #
 from ocean_lib.assets.asset import V3Asset

ocean_lib/assets/test/test_asset_downloader.py

@@ -1,10 +1,11 @@
 #
-# Copyright 2021 Ocean Protocol Foundation
+# Copyright 2022 Ocean Protocol Foundation
 # SPDX-License-Identifier: Apache-2.0
 #
 import os
 
 import pytest
+
 from ocean_lib.assets.asset_downloader import download_asset_files
 from ocean_lib.common.agreements.service_types import ServiceTypes
 from ocean_lib.data_provider.data_service_provider import DataServiceProvider

ocean_lib/assets/test/test_asset_resolver.py

@@ -1,10 +1,11 @@
 #
-# Copyright 2021 Ocean Protocol Foundation
+# Copyright 2022 Ocean Protocol Foundation
 # SPDX-License-Identifier: Apache-2.0
 #
 import json
 
 import pytest
+
 from ocean_lib.assets.asset import V3Asset
 from ocean_lib.assets.asset_resolver import resolve_asset
 from tests.resources.ddo_helpers import wait_for_ddo

ocean_lib/assets/test/test_did.py

@@ -1,5 +1,5 @@
 #
-# Copyright 2021 Ocean Protocol Foundation
+# Copyright 2022 Ocean Protocol Foundation
 # SPDX-License-Identifier: Apache-2.0
 #
 """
@@ -11,6 +11,8 @@
 import secrets
 
 import pytest
+from web3 import Web3
+
 from ocean_lib.assets.did import (
     DID,
     OCEAN_PREFIX,
@@ -19,7 +21,6 @@
     did_to_id_bytes,
     id_to_did,
 )
-from web3 import Web3
 
 TEST_SERVICE_TYPE = "ocean-meta-storage"
 TEST_SERVICE_URL = "http://localhost:8005"

ocean_lib/assets/test/test_utils.py

@@ -1,10 +1,11 @@
 #
-# Copyright 2021 Ocean Protocol Foundation
+# Copyright 2022 Ocean Protocol Foundation
 # SPDX-License-Identifier: Apache-2.0
 #
 from unittest.mock import patch
 
 import pytest
+
 from ocean_lib.assets.did import DID
 from ocean_lib.assets.trusted_algorithms import (
     add_publisher_trusted_algorithm,

ocean_lib/assets/trusted_algorithms.py

@@ -1,11 +1,12 @@
 #
-# Copyright 2021 Ocean Protocol Foundation
+# Copyright 2022 Ocean Protocol Foundation
 # SPDX-License-Identifier: Apache-2.0
 #
 import json
 from typing import Optional, Union
 
 from enforce_typing import enforce_types
+
 from ocean_lib.assets.asset import V3Asset
 from ocean_lib.assets.asset_resolver import resolve_asset
 from ocean_lib.common.agreements.service_types import ServiceTypes