From 8a35506f49c7b06e08ceadccaa07547f72099f4c Mon Sep 17 00:00:00 2001 From: alexcos20 Date: Tue, 21 Nov 2023 15:03:26 +0200 Subject: [PATCH 1/4] bump contracts --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index bda5b944..a9337497 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ # Installed by pip install ocean-provider # or pip install -e . install_requirements = [ - "ocean-contracts==1.1.15", + "ocean-contracts==2.0.2", "web3==5.25.0", "Flask==2.1.2", "Flask-Cors==3.0.9", From 50455da837ab2fa2b3cbd5e7d574acec84a996b8 Mon Sep 17 00:00:00 2001 From: alexcos20 Date: Tue, 21 Nov 2023 15:25:19 +0200 Subject: [PATCH 2/4] =?UTF-8?q?Bump=20version:=202.1.5=20=E2=86=92=202.1.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 84ed962b..0b94d6c0 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.1.5 +current_version = 2.1.6 commit = True tag = True diff --git a/setup.py b/setup.py index a9337497..d4723d2d 100644 --- a/setup.py +++ b/setup.py @@ -100,7 +100,7 @@ url="https://github.com/oceanprotocol/provider-py", # fmt: off # bumpversion needs single quotes - version='2.1.5', + version='2.1.6', # fmt: on zip_safe=False, ) From 00a18c40601a118a22f9502aa9ecb1db1e72749e Mon Sep 17 00:00:00 2001 From: alexcos20 Date: Wed, 22 Nov 2023 09:14:17 +0200 Subject: [PATCH 3/4] test upcoming barge --- .github/workflows/pytest.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 0b22e1c9..a1703bee 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -23,6 +23,7 @@ jobs: with: repository: "oceanprotocol/barge" path: 'barge' + ref: feature/bump_contracts_and_subgraph - name: Login to Docker Hub if: ${{ env.DOCKERHUB_PASSWORD && env.DOCKERHUB_USERNAME }} run: | From 314594f9f6feffb2f9ec354ff7dc05e9b488a1de Mon Sep 17 00:00:00 2001 From: alexcos20 Date: Wed, 22 Nov 2023 10:03:16 +0200 Subject: [PATCH 4/4] put back main barge, cause tests were green --- .github/workflows/pytest.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index a1703bee..0b22e1c9 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -23,7 +23,6 @@ jobs: with: repository: "oceanprotocol/barge" path: 'barge' - ref: feature/bump_contracts_and_subgraph - name: Login to Docker Hub if: ${{ env.DOCKERHUB_PASSWORD && env.DOCKERHUB_USERNAME }} run: |