From 3a5a59515a768ab56afcf068f7d0a39bbf336327 Mon Sep 17 00:00:00 2001 From: angrybayblade Date: Fri, 1 Dec 2023 15:06:37 +0530 Subject: [PATCH 1/3] chore: bump open-aea@1.42.0, open-autonomy@0.13.8 and tomte@0.2.15 --- Pipfile | 20 +- docs/index.md | 2 +- packages/packages.json | 60 ++-- .../valory/services/contribute/service.yaml | 2 +- scripts/bump.py | 316 ++++++++++++++++++ tox.ini | 32 +- 6 files changed, 378 insertions(+), 54 deletions(-) create mode 100644 scripts/bump.py diff --git a/Pipfile b/Pipfile index 4b1a9cd..a87adbc 100644 --- a/Pipfile +++ b/Pipfile @@ -9,7 +9,7 @@ name = "pypi" [dev-packages] # we fix exact versions as it's sufficient to have at least one set of compatible dependencies for development -aiohttp = "==3.7.4.post0" +aiohttp = "<4.0.0,>=3.8.5" asn1crypto = "==1.5.1" Authlib = "==1.2.0" certifi = "==2021.10.8" @@ -27,18 +27,18 @@ pytest = "==7.2.1" pytest-asyncio = "==0.20.3" pytest-cov = "==4.0.0" pytest-randomly = "==3.12.0" -openapi-core = "==0.13.2" -openapi-spec-validator = "==0.2.8" -open-aea = "==1.41.0.post1" -open-aea-ledger-ethereum = "==1.41.0.post1" -open-aea-ledger-cosmos = "==1.41.0.post1" -open-aea-cli-ipfs = "==1.41.0.post1" -open-aea-test-autonomy = "==0.13.4" -open-autonomy = {version = "==0.13.4", extras = [ "all"]} +openapi-core = "==0.15.0" +openapi-spec-validator = "<0.5.0,>=0.4.0" +open-aea = "==1.42.0" +open-aea-ledger-ethereum = "==1.42.0" +open-aea-ledger-cosmos = "==1.42.0" +open-aea-cli-ipfs = "==1.42.0" +open-aea-test-autonomy = "==0.13.8" +open-autonomy = {version = "==0.13.8", extras = ["all"]} openai = "==0.27.2" tweepy = "==4.14.0" twitter_text_parser = "==3.0.0" -tomte = {version = "==0.2.12", extras = ["cli", "tests"]} +tomte = {version = "==0.2.15", extras = ["cli", "tests"]} [requires] python_version = "3.10" diff --git a/docs/index.md b/docs/index.md index 817c027..1f384c1 100644 --- a/docs/index.md +++ b/docs/index.md @@ -35,7 +35,7 @@ In order to run a local demo service based on the IEKit: 2. Fetch the IEKit. ```bash - autonomy fetch valory/impact_evaluator:0.1.0:bafybeibzsx4dhgr757r2nn4j7fbtbssqhvortyw4wr2qtntccjktqm54hq --service + autonomy fetch valory/impact_evaluator:0.1.0:bafybeihna6zpewivep3ayangyvvz3uzcr67wtypoafdkxqgnitdaxcabw4 --service ``` 3. Build the Docker image of the service agents diff --git a/packages/packages.json b/packages/packages.json index 304c782..8920bdd 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -1,6 +1,6 @@ { "dev": { - "service/valory/contribute/0.1.0": "bafybeih5tyvnzdcs2oxaiyuvldapzlallbsfbgqq6px7625cti7b2jfg7i" + "service/valory/contribute/0.1.0": "bafybeiejqob6hy3d3bc3oq3koed5lx4dzvwa34wiaxa4tapiz5hhkrcazu" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeie7xyems76v5b4wc2lmaidcujizpxfzjnnwdeokmhje53g7ym25ii", @@ -11,37 +11,39 @@ "protocol/valory/acn/1.1.0": "bafybeic2pxzfc3voxl2ejhcqyf2ehm4wm5gxvgx7bliloiqi2uppmq6weu", "protocol/valory/ipfs/0.1.0": "bafybeiedxeismnx3k5ty4mvvhlqideixlhqmi5mtcki4lxqfa7uqh7p33u", "protocol/valory/tendermint/0.1.0": "bafybeig6g6twajlwssfbfp5rlnu5mwzuu5kgak5cs4fich7rlkx6whesnu", - "skill/valory/abstract_abci/0.1.0": "bafybeifmfv4bgt5vzvgawlocksacqeadzg72zs4usvgjaf245hbbptpiki", - "skill/valory/reset_pause_abci/0.1.0": "bafybeiflxcl2dtzayyzzddc4f2astzxunyp66meutornanrgeemicdea5q", - "skill/valory/registration_abci/0.1.0": "bafybeib2whqixp5265d53sa6szkz7woet4awuqr4dekb2hokpgps5codme", - "skill/valory/abstract_round_abci/0.1.0": "bafybeigrqhygo2hl2owisj5rqyh3acdvee773ajije64snlzalcgtaac7q", - "contract/valory/service_registry/0.1.0": "bafybeic4bgql6x5jotp43ddazybmyb7macifjzudavqll3547ayhawttpi", - "connection/valory/abci/0.1.0": "bafybeigzgupmh6kwwx4jbqkw7qri5vr6vz53xbi4uksulh6oiovdplmviu", - "connection/valory/http_client/0.23.0": "bafybeifgeqgryx6b3s6eseyzyezygmeitcpt3tkor2eiycozoi6clgdrny", - "connection/valory/ipfs/0.1.0": "bafybeigfmqvlzbp67fttccpl4hsu3zaztbxv6vd7ikzra2hfppfkalgpji", - "connection/valory/ledger/0.19.0": "bafybeigdckv3e6bz6kfloz4ucqrsufft6k4jp6bwkbbcvh4fxvgbmzq3dm", + "skill/valory/abstract_abci/0.1.0": "bafybeiflcfufixmsrhobf56bn5745m2iipcfqyulwk2qegtnagb3kvaaxi", + "skill/valory/reset_pause_abci/0.1.0": "bafybeidzajbe3erygeh2xbd6lrjv7nsptznjuzrt24ykgvhgotdeyhfnba", + "skill/valory/registration_abci/0.1.0": "bafybeic2ynseiak7jpta7jfwuqwyp453b4p7lolr4wihxmpn633uekv5am", + "skill/valory/abstract_round_abci/0.1.0": "bafybeiaqcl7h2famylusiffigwem7tevkcsyocdu5xd42jkmgq6kvowzgq", + "contract/valory/service_registry/0.1.0": "bafybeia2swgpmczn3iykmptigabklk2eqbqxzhmbnunq3givmjygvmgtbm", + "connection/valory/abci/0.1.0": "bafybeiejo5uyurbmafretedivyci2ktastxclbmgrkwcwc2yt36jftyqgm", + "connection/valory/http_client/0.23.0": "bafybeiddrfvomrmgvh5yuv2coq7ci72wcdf663stayi3m5aawnj4srggce", + "connection/valory/ipfs/0.1.0": "bafybeihx7wb5hngjobw2salzqqryrhxvmxfuw7o2npjyqd2talmh2flqeq", + "connection/valory/ledger/0.19.0": "bafybeia47rr37ianvwsh77tjjpv3nwif5sywhhy2fbdshnz4a2icwln76a", "connection/valory/p2p_libp2p_client/0.1.0": "bafybeihge56dn3xep2dzomu7rtvbgo4uc2qqh7ljl3fubqdi2lq44gs5lq", - "connection/valory/http_server/0.22.0": "bafybeie3d6tj2kzewced4nnttxdvr7njue2ortvawmwdt67gwf4tcuosom", - "agent/valory/impact_evaluator/0.1.0": "bafybeibzsx4dhgr757r2nn4j7fbtbssqhvortyw4wr2qtntccjktqm54hq", - "contract/valory/dynamic_contribution/0.1.0": "bafybeibcx2ds2bcrgunbijnnyhionjmvjh2gfoqp6h2utdukwqo45zd3re", - "skill/valory/dynamic_nft_abci/0.1.0": "bafybeibj7qumdbsd7pubut2kmtcpzaxz2ey4v3virs4mldrzmttkt6wo2m", - "skill/valory/twitter_scoring_abci/0.1.0": "bafybeidomknnbxkuxeywcej3jpr7fhaohouejtjrb7ya7ve3ntnlcfxxbi", - "skill/valory/ceramic_read_abci/0.1.0": "bafybeiall2unkqofaq7khuphm7aekbp7r42ett5hu5zv3pkbedhyzmathu", - "skill/valory/ceramic_write_abci/0.1.0": "bafybeif73tpmbaslwpijsqmrdzb3e5veegaan46tei2fiknnrn2eilhggy", - "skill/valory/impact_evaluator_abci/0.1.0": "bafybeig2s346rktli4a7lh44ffgekizztpo3bwv26l4y2ltzk4d6silv34", - "skill/valory/generic_scoring_abci/0.1.0": "bafybeiclx5ackxojolldx5vug2p5hn3jnu5whqyhpth22gcrd67o322cha", - "skill/valory/olas_week_abci/0.1.0": "bafybeievtrydq4tbscb2vwcrrbe6ilzj2j5isusmv4fy2hdsowce2nncjy", + "connection/valory/http_server/0.22.0": "bafybeiesafy2af2wakqvsal4hz6ldycb73j5w62szhwy25iyhlf2wgyg44", + "agent/valory/impact_evaluator/0.1.0": "bafybeihna6zpewivep3ayangyvvz3uzcr67wtypoafdkxqgnitdaxcabw4", + "contract/valory/dynamic_contribution/0.1.0": "bafybeia54zrihbupv35dkw23x4lc7cgeh3obinqlszvjighm7rxap6komi", + "contract/valory/mech/0.1.0": "bafybeibv6ydk326zkny4pphze64zgzzv2sc5qkt2iyymoi6pt3ci2gtxne", + "skill/valory/dynamic_nft_abci/0.1.0": "bafybeibwx2r4pdvzy2myn5keawjskd5mz2w7yfdflqff5wz4cxiubpanlu", + "skill/valory/twitter_scoring_abci/0.1.0": "bafybeiezvn76bbkmfuddcitooj7b3r7kv4cdehz7noepybqylhz2cjt3hm", + "skill/valory/ceramic_read_abci/0.1.0": "bafybeigqpkvsxfhz5jt3yuipmkl6eyfgqcw36226sgfhdgud7mphsjmopa", + "skill/valory/ceramic_write_abci/0.1.0": "bafybeighmakx2u2okkvokdimxyzrnfn5qb2cib3qzvzdh4tnkfr6hkx32a", + "skill/valory/impact_evaluator_abci/0.1.0": "bafybeihv52iil4qknszjts33wpiknbvx46g2otowl6w2oklx3pvb5g7fye", + "skill/valory/generic_scoring_abci/0.1.0": "bafybeiexjfu736oe3u43siklxsyqwvlltoks5rnmhl2t7jjmwpwuhc3fey", + "skill/valory/olas_week_abci/0.1.0": "bafybeiholnppuo6zfrxh3yqjedvf5m7s2w6ahwsdfq444zfo7jlvfigfdu", "protocol/valory/twitter/0.1.0": "bafybeig7dugazhljpb4qtu4zfnoimttvivopiq574rogjz3qggf5eysnk4", "protocol/valory/llm/1.0.0": "bafybeihj2orqapokafg7co3wlogwgf6cckaaj2bz3nuv4rm3opkoyhrlp4", - "connection/valory/twitter/0.1.0": "bafybeies2hfmhirfw6vkg5jvdi6wxqddrtyroh5qvzqvduvhv3zlets564", - "connection/valory/openai/0.1.0": "bafybeigiib2l2vji4ehr7jm43bwpzhxe4u2ih4ybwy5zwmkpyjmj3k7u3e", - "skill/valory/twitter_write_abci/0.1.0": "bafybeifzxtqnumlm65f764hwx3zbpzpwesniizprj67cacvlaytiwnz4qy", - "skill/valory/llm_abci/0.1.0": "bafybeiap5ar62aj3vzforji33k5wkxngoumdgztutk2i5y3w7avkwx55ua", - "skill/valory/decision_making_abci/0.1.0": "bafybeifxsrfk7jkoacfk654jjpmwaabkwt4t42tuda4rpdyfbsf5rp4mdy", + "connection/valory/twitter/0.1.0": "bafybeigwywkh4ep72pu6yqr4v3qkahj6buo6f4ng5hhgkkgr5fvcv6ztey", + "connection/valory/openai/0.1.0": "bafybeiepsxac7e2tq3mcfkgcx62zt6oiaeic5wwcs4mnv733l762kn62du", + "skill/valory/twitter_write_abci/0.1.0": "bafybeigcpqeu2ymlgozqq6o6befqnmvyfkudqpvfvh255ovrtd3erhodlu", + "skill/valory/llm_abci/0.1.0": "bafybeiav6mfjf5ltrhpmrelfpix3s7irgrk35ejx6zuqjm4wengyihmsse", + "skill/valory/decision_making_abci/0.1.0": "bafybeibx6wvyp76xkzcdnfpluxjoxlwqpcgmn7ovyam6pghhl6jfdz6kie", "contract/valory/multisend/0.1.0": "bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y", - "skill/valory/transaction_settlement_abci/0.1.0": "bafybeigxkdujugzvve2dszkwr5kgfx4uhz2epofo4lorbcnthmzfjegwzi", - "skill/valory/termination_abci/0.1.0": "bafybeifazwrksp756h7z42qqfcgi6lya6wmhbx46l7ghlaooe45gqnju7q", - "contract/valory/gnosis_safe_proxy_factory/0.1.0": "bafybeigejiv4fkksyjwmr6doo23kfpicfbktuwspbamasyvjusfdyjtrxy", - "contract/valory/gnosis_safe/0.1.0": "bafybeifmsjpgbifvk7y462rhfczvjvpigkdniavghhg5utza3hbnffioq4" + "skill/valory/transaction_settlement_abci/0.1.0": "bafybeiaefgqbs7zsn5xe5kdwrujj7ivygkn3ujpw6crnvi3knvxw75qmja", + "skill/valory/termination_abci/0.1.0": "bafybeie4zvjfxvdu7qrulmur3chpjz3kpj5m4bjsxvpk4gvj5zbyyayfaa", + "contract/valory/gnosis_safe_proxy_factory/0.1.0": "bafybeidvcgnbbmjtha6tl7st2ysna2l3iiqfhnzjfasyvml5unecozeeka", + "contract/valory/gnosis_safe/0.1.0": "bafybeidll7frtdsq2ckiluazkwk4zpkp7natt4kdejjehwvykqwzyuf6ei", + "skill/valory/mech_interact_abci/0.1.0": "bafybeielb6agwj5jfdv3nqnc7iugb4qz5us223jpr5uwolke4fmzxvmkna" } } \ No newline at end of file diff --git a/packages/valory/services/contribute/service.yaml b/packages/valory/services/contribute/service.yaml index 6b321f2..1ae23d8 100644 --- a/packages/valory/services/contribute/service.yaml +++ b/packages/valory/services/contribute/service.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeihmwh3lzuhmmzozuifqzkfhi2vo2u7gc4lzacvhit47ldm24vfeki fingerprint_ignore_patterns: [] -agent: valory/impact_evaluator:0.1.0:bafybeibzsx4dhgr757r2nn4j7fbtbssqhvortyw4wr2qtntccjktqm54hq +agent: valory/impact_evaluator:0.1.0:bafybeihna6zpewivep3ayangyvvz3uzcr67wtypoafdkxqgnitdaxcabw4 number_of_agents: 4 deployment: agent: diff --git a/scripts/bump.py b/scripts/bump.py new file mode 100644 index 0000000..a868d23 --- /dev/null +++ b/scripts/bump.py @@ -0,0 +1,316 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2023 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + +""" +Script for bumping core dependencies. + +This script + +- Fetches the latest core dependency versions from github +- Updates the tox.ini, packages and Pipfile/pyproject.toml files +- Performs the packages sync +""" + +import os +import re +import typing as t +from pathlib import Path + +import click +import requests +from aea.cli.utils.click_utils import PackagesSource, PyPiDependency +from aea.configurations.constants import PACKAGES, PACKAGE_TYPE_TO_CONFIG_FILE +from aea.configurations.data_types import Dependency +from aea.helpers.logging import setup_logger +from aea.helpers.yaml_utils import yaml_dump, yaml_dump_all, yaml_load, yaml_load_all +from aea.package_manager.v1 import PackageManagerV1 + +from autonomy.cli.helpers.ipfs_hash import load_configuration + + +BUMP_BRANCH = "chore/bump" +PIPFILE = Path.cwd() / "Pipfile" +PYPROJECT_TOML = Path.cwd() / "pyproject.toml" +TOX_INI = Path.cwd() / "tox.ini" + +TAGS_URL = "https://api.github.com/repos/{repo}/tags" +FILE_URL = "https://raw.githubusercontent.com/{repo}/{tag}/{file}" + +VERISON_RE = re.compile(r"(__version__|version)( )?=( )?\"(?P[0-9a-z\.]+)\"") + +OPEN_AEA_REPO = "valory-xyz/open-aea" +OPEN_AUTONOMY_REPO = "valory-xyz/open-autonomy" + +DEPENDENCY_SPECS = { + "open-aea": { + "repo": OPEN_AEA_REPO, + "file": "aea/__version__.py", + }, + "open-aea-ledger-ethereum": { + "repo": OPEN_AEA_REPO, + "file": "plugins/aea-ledger-ethereum/setup.py", + }, + "open-aea-ledger-ethereum-flashbots": { + "repo": OPEN_AEA_REPO, + "file": "plugins/aea-ledger-ethereum-flashbots/setup.py", + }, + "open-aea-ledger-ethereum-hwi": { + "repo": OPEN_AEA_REPO, + "file": "plugins/aea-ledger-ethereum-hwi/setup.py", + }, + "open-aea-ledger-cosmos": { + "repo": OPEN_AEA_REPO, + "file": "plugins/aea-ledger-cosmos/setup.py", + }, + "open-aea-ledger-solana": { + "repo": OPEN_AEA_REPO, + "file": "plugins/aea-ledger-solana/setup.py", + }, + "open-aea-cli-ipfs": { + "repo": OPEN_AEA_REPO, + "file": "plugins/aea-cli-ipfs/setup.py", + }, + "open-autonomy": { + "repo": OPEN_AUTONOMY_REPO, + "file": "autonomy/__version__.py", + }, + "open-aea-test-autonomy": { + "repo": OPEN_AUTONOMY_REPO, + "file": "plugins/aea-test-autonomy/setup.py", + }, +} + +_cache_file = Path.home() / ".aea" / ".gitcache" +_version_cache = {} +_logger = setup_logger("bump") + + +def load_git_cache() -> None: + """Load versions cache.""" + if not _cache_file.exists(): + return + with _cache_file.open("r", encoding="utf-8") as stream: + _version_cache.update(yaml_load(stream=stream)) + + +def dump_git_cache() -> None: + """Dump versions cache.""" + with _cache_file.open("w", encoding="utf-8") as stream: + yaml_dump(data=_version_cache, stream=stream) + + +def make_git_request(url: str) -> requests.Response: + """Make git request""" + auth = os.environ.get("GITHUB_AUTH") + if auth is None: + return requests.get(url=url) + return requests.get(url=url, headers={"Authorization": f"Bearer {auth}"}) + + +def get_latest_tag(repo: str) -> str: + """Fetch latest git tag.""" + if repo in _version_cache: + return _version_cache[repo] + + response = make_git_request(url=TAGS_URL.format(repo=repo)) + if response.status_code != 200: + raise ValueError( + f"Fetching tags from `{repo}` failed with message '" + + response.json()["message"] + + "'" + ) + latest_tag_data, *_ = response.json() + _version_cache[repo] = latest_tag_data["name"] + return _version_cache[repo] + + +def get_dependency_version(repo: str, file: str) -> str: + """Get version spec .""" + response = make_git_request( + FILE_URL.format( + repo=repo, + tag=get_latest_tag(repo=repo), + file=file, + ) + ) + if response.status_code != 200: + raise ValueError( + f"Fetching packages from `{repo}` failed with message '" + + response.text + + "'" + ) + ((*_, version),) = VERISON_RE.findall(response.content.decode()) + return f"=={version}" + + +def get_dependencies() -> t.Dict: + """Get dependency->version mapping.""" + dependencies = {} + for dependency, specs in DEPENDENCY_SPECS.items(): + version = _version_cache.get( + dependency, + get_dependency_version( + repo=specs["repo"], + file=specs["file"], + ), + ) + dependencies[dependency] = version + _version_cache.update(dependencies) + return dependencies + + +def bump_pipfile_or_pyproject(file: Path, dependencies: t.Dict[str, str]) -> None: + """Bump Pipfile.""" + if not file.exists(): + return + + _logger.info(f"Updating {file.name}") + updated = "" + content = file.read_text(encoding="utf-8") + for line in content.split("\n"): + try: + spec = Dependency.from_pipfile_string(line) + update = dependencies.get(spec.name) + if update is None: + updated += line + "\n" + continue + spec = Dependency( + name=spec.name, + version=update, + extras=spec.extras, + ) + updated += spec.to_pipfile_string() + "\n" + except ValueError: + updated += line + "\n" + file.write_text(updated[:-1], encoding="utf-8") + + +def bump_tox(dependencies: t.Dict[str, str]) -> None: + """Bump tox file.""" + if not TOX_INI.exists(): + return + + _logger.info("Updating tox.ini") + updated = "" + content = TOX_INI.read_text(encoding="utf-8") + for line in content.split("\n"): + try: + spec = Dependency.from_string(line.lstrip().rstrip()) + update = dependencies.get(spec.name) + if update is None: + updated += line + "\n" + continue + spec = Dependency( + name=spec.name, + version=update, + extras=spec.extras, + ) + updated += " " + spec.to_pip_string() + "\n" + except ValueError: + updated += line + "\n" + TOX_INI.write_text(updated[:-1], encoding="utf-8") + + +def bump_packages(dependencies: t.Dict[str, str]) -> None: + """Bump packages.""" + _logger.info("Updating packages") + manager = PackageManagerV1.from_dir(Path(PACKAGES)) + for package_id in manager.dev_packages: + path = ( + manager.package_path_from_package_id( + package_id=package_id, + ) + / PACKAGE_TYPE_TO_CONFIG_FILE[package_id.package_type.value] + ) + with path.open("r", encoding="utf-8") as stream: + config, *extra = yaml_load_all(stream=stream) + + for name in config.get("dependencies", {}): + update = dependencies.get(name) + if update is None: + continue + config["dependencies"][name]["version"] = update + + with path.open("w", encoding="utf-8") as stream: + yaml_dump_all([config, *extra], stream=stream) + + +@click.command(name="bump") +@click.option( + "-d", + "--dependency", + "extra", + type=PyPiDependency(), + multiple=True, + help="Specify extra dependency.", +) +@click.option( + "-s", + "--source", + "sources", + type=PackagesSource(), + multiple=True, + help="Specify extra sources.", +) +@click.option("--sync", is_flag=True, help="Perform sync.") +@click.option( + "--no-cache", + is_flag=True, + default=False, + help="Avoid using cache to bump.", +) +def main( + extra: t.Tuple[Dependency, ...], + sources: t.Tuple[str, ...], + sync: bool, + no_cache: bool, +) -> None: + """Run the bump script.""" + + if not no_cache: + load_git_cache() + + dependencies = {} + dependencies.update(get_dependencies()) + dependencies.update({dep.name: dep.version for dep in extra or []}) + + bump_pipfile_or_pyproject(PIPFILE, dependencies=dependencies) + bump_pipfile_or_pyproject(PYPROJECT_TOML, dependencies=dependencies) + bump_tox(dependencies=dependencies) + bump_packages(dependencies=dependencies) + dump_git_cache() + + if sync: + pm = PackageManagerV1.from_dir( + Path.cwd() / PACKAGES, config_loader=load_configuration + ) + pm.sync( + sources=[ + f"{OPEN_AEA_REPO}:{_version_cache[OPEN_AEA_REPO]}", + f"{OPEN_AUTONOMY_REPO}:{_version_cache[OPEN_AUTONOMY_REPO]}", + *sources, + ], + update_packages=True, + ) + pm.update_package_hashes() + pm.dump() + + +if __name__ == "__main__": + main() # pylint: disable=no-value-for-parameter diff --git a/tox.ini b/tox.ini index 1713f7d..a3a8020 100644 --- a/tox.ini +++ b/tox.ini @@ -16,7 +16,7 @@ whitelist_externals = /bin/sh passenv = * extras = all deps = - aiohttp==3.7.4.post0 + aiohttp<4.0.0,>=3.8.5 asn1crypto==1.5.1 Authlib==1.2.0 certifi==2021.10.8 @@ -32,14 +32,14 @@ deps = pytest-randomly==3.11.0 pytest-cov==3.0.0 pytest-asyncio==0.18.0 - openapi-core==0.13.2 - openapi-spec-validator==0.2.8 - open-aea==1.41.0.post1 - open-aea-ledger-ethereum==1.41.0.post1 - open-aea-ledger-cosmos==1.41.0.post1 - open-aea-cli-ipfs==1.41.0.post1 - open-aea-test-autonomy==0.13.4 - open-autonomy==0.13.4 + openapi-core==0.15.0 + openapi-spec-validator<0.5.0,>=0.4.0 + open-aea==1.42.0 + open-aea-ledger-ethereum==1.42.0 + open-aea-ledger-cosmos==1.42.0 + open-aea-cli-ipfs==1.42.0 + open-aea-test-autonomy==0.13.8 + open-autonomy==0.13.8 openai==0.27.2 tweepy==4.14.0 twitter_text_parser==3.0.0 @@ -225,7 +225,7 @@ skipsdist = True skip_install = True deps = {[testenv]deps} - tomte[mypy]==0.2.12 + tomte[mypy]==0.2.15 commands = mypy scripts --disallow-untyped-defs --config-file tox.ini [testenv:pylint] @@ -233,7 +233,7 @@ whitelist_externals = /bin/sh skipsdist = True deps = {[testenv]deps} - tomte[pylint]==0.2.12 + tomte[pylint]==0.2.15 commands = pylint --ignore-patterns=".*_pb2.py" --disable=C0103,R0801,R0912,C0301,C0201,C0204,C0209,W1203,C0302,R1735,R1729,W0511 scripts [testenv:safety] @@ -252,8 +252,8 @@ commands = darglint scripts skipsdist = True usedevelop = True deps = - tomte[isort]==0.2.12 - tomte[black]==0.2.12 + tomte[isort]==0.2.15 + tomte[black]==0.2.15 commands = aea generate-all-protocols --check-clean [testenv:abci-docstrings] @@ -353,6 +353,12 @@ ignore_missing_imports=True [mypy-yaml] ignore_missing_imports=True +[mypy-click.*] +ignore_missing_imports=True + +[mypy-autonomy.*] +ignore_missing_imports=True + [darglint] docstring_style=sphinx strictness=short From d26275ab1641bca3781f9add9adadf60057717bc Mon Sep 17 00:00:00 2001 From: angrybayblade Date: Fri, 1 Dec 2023 15:07:24 +0530 Subject: [PATCH 2/3] fix: mkdocs config --- mkdocs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mkdocs.yml b/mkdocs.yml index a8038f2..8c3865d 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -56,8 +56,8 @@ markdown_extensions: alternate_style: true - pymdownx.highlight - pymdownx.emoji: - emoji_index: !!python/name:materialx.emoji.twemoji - emoji_generator: !!python/name:materialx.emoji.to_svg + emoji_index: !!python/name:material.extensions.emoji.twemoji + emoji_generator: !!python/name:material.extensions.emoji.to_svg - pymdownx.arithmatex: generic: true - pymdownx.superfences: From bc6117b5f9984ca8664f89fac77853377d4fc120 Mon Sep 17 00:00:00 2001 From: angrybayblade Date: Mon, 4 Dec 2023 14:41:23 +0530 Subject: [PATCH 3/3] chore: remove faluty link --- docs/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.md b/docs/index.md index 1f384c1..ecafa1a 100644 --- a/docs/index.md +++ b/docs/index.md @@ -78,7 +78,7 @@ In order to run a local demo service based on the IEKit: 2. Create a Ceramic Decentralized Identity (DID) using [Glaze](https://github.com/ceramicstudio/js-glaze). - 3. Using the DID created in the previous step, create two empty Ceramic streams. You can follow [this tutorial](https://developers.ceramic.network/reference/stream-programs/tile-document/). The service will optionally read generic scores from the first one and will write scores to the second one. + 3. Using the DID created in the previous step, create two empty Ceramic streams. The service will optionally read generic scores from the first one and will write scores to the second one. 4. Create an API key for [Infura](https://www.infura.io/) or your preferred provider.