Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove forked dependencies #665

Merged
merged 35 commits into from
Sep 26, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
a7d290b
fix: rewrite aea runtime script to import `struct_pb2` at the top level
angrybayblade Sep 18, 2023
ef0325d
fix: patch protobuf import namespace
angrybayblade Sep 18, 2023
93dda37
fix: linters
angrybayblade Sep 18, 2023
94f1afc
feat: compile protocol buffers to latest
angrybayblade Sep 18, 2023
78953ff
feat: make target for building protocol buffers
angrybayblade Sep 18, 2023
918a31a
chore: revert changed on setup.py
angrybayblade Sep 19, 2023
557dd11
feat: pin `web3>=6.0.0,<7`, `protobuf>=4.21.6,<5.0.0`, `open-aea-cosm…
angrybayblade Sep 19, 2023
2ae120f
feat: apply patch at the top level import
angrybayblade Sep 19, 2023
ba1e2be
feat: bump protocol generator
angrybayblade Sep 19, 2023
55964b1
feat: update protocol generator templating
angrybayblade Sep 19, 2023
04e6bf1
feat: generate protocols
angrybayblade Sep 19, 2023
0ad6bd8
chore: linters
angrybayblade Sep 19, 2023
f7393c9
chore: copyright
angrybayblade Sep 19, 2023
9d2b453
chore: hashes
angrybayblade Sep 19, 2023
ef10a7b
chore: generate test protocols
angrybayblade Sep 19, 2023
d7dc2ee
fix: protoc gen tests
angrybayblade Sep 20, 2023
4b132a9
chore: add protobuf incompatibility warning
angrybayblade Sep 21, 2023
f5b4034
fix: set `PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python1 so that the …
angrybayblade Sep 21, 2023
5e0bebe
fix: pin `jsonschema<=4.19.0,>=4.16.0`
angrybayblade Sep 21, 2023
7115308
chore: linters
angrybayblade Sep 21, 2023
9ee5648
fix: increase profiler test timeout
angrybayblade Sep 21, 2023
82e34b2
fix: increase timeout
angrybayblade Sep 21, 2023
4e65e11
fix: skip tests failures on windows
angrybayblade Sep 22, 2023
12914f8
fix: copyright
angrybayblade Sep 22, 2023
a1226bc
fix: skip tests which require the ACN node build on windows
angrybayblade Sep 22, 2023
30a02c5
chore: hashes
angrybayblade Sep 22, 2023
8a6d466
Merge pull request #667 from valory-xyz/fix/hwi-plugin-protobuf-incom…
angrybayblade Sep 22, 2023
34cf4ef
chore: skip more tests
angrybayblade Sep 25, 2023
861d3c9
Merge pull request #666 from valory-xyz/feat/bump-protocol-gen
angrybayblade Sep 25, 2023
7303855
chore: skip more tests
angrybayblade Sep 25, 2023
408e155
Merge branch 'main' into fix/remove-forked-dependencies
angrybayblade Sep 25, 2023
b619f05
chore: spell check
angrybayblade Sep 25, 2023
a129601
chore: fix doc hashes
angrybayblade Sep 25, 2023
0dac911
chore: linters
angrybayblade Sep 25, 2023
e5fc97e
Merge branch 'main' into fix/remove-forked-dependencies
angrybayblade Sep 26, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions aea/cli/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
# ------------------------------------------------------------------------------
#
# Copyright 2023 Valory AG
# Copyright 2018-2019 Fetch.AI Limited
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -19,4 +20,19 @@

"""This module contains the implementation of command-line tool 'aea'."""

# pylint: disable=wrong-import-position

import sys


# Patch to fix https://github.com/protocolbuffers/protobuf/issues/3276

_google_upb_message = sys.modules.pop("google._upb._message", None)

from google.protobuf import struct_pb2 as google_dot_protobuf_dot_struct__pb2


if _google_upb_message is not None:
sys.modules["google._upb._message"] = _google_upb_message

from .core import cli
6 changes: 4 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,21 @@
# limitations under the License.
#
# ------------------------------------------------------------------------------
import sys
import os
import re
import shutil
import sys
from pathlib import Path
angrybayblade marked this conversation as resolved.
Show resolved Hide resolved
from typing import Dict

from setuptools import find_packages, setup # type: ignore


PACKAGE_NAME = "aea"
here = os.path.abspath(os.path.dirname(__file__))


def get_all_extras() -> Dict:

cli_deps = [
"click==8.0.2",
"pyyaml==6.0.1",
Expand Down
Loading