Skip to content

Commit fadf792

Browse files
Merge pull request #1784 from fetchai/develop
Release v0.6.2
2 parents ce418be + 343241c commit fadf792

576 files changed

Lines changed: 9258 additions & 5171 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/workflow.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ jobs:
5252
- name: Code style check
5353
run: |
5454
tox -e black-check
55+
tox -e isort-check
5556
tox -e flake8
5657
- name: Unused code check
5758
run: tox -e vulture

.pylintrc

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22
ignore-patterns=serialization.py,message.py,__main__.py,.*_pb2.py
33

44
[MESSAGES CONTROL]
5-
disable=C0103,C0201,C0301,C0302,C0330,W0105,W0107,W1202,W1203,R0902,R0913,R0914,R0801,R0904,R0903,R0911,R0912,R0901,R0916,R1702,R0915
5+
disable=C0103,C0201,C0301,C0302,C0330,W0105,W0107,W0707,W1202,W1203,R0902,R0913,R0914,R0801,R0911,R0912,R0901,R0916,R1702,R0915
66

77
## Eventually resolve these:
8+
# W0707: raise-missing-from
89
# R0902: too-many-instance-attributes
910
# R0913: too-many-arguments
1011
# R0914: too-many-locals
11-
# R0904: too-many-public-methods
12-
# R0903: too-few-public-methods
1312
# R0911: too-many-return-statements
1413
# R0912: too-many-branches
1514
# R0901: too-many-ancestors
@@ -32,3 +31,7 @@ disable=C0103,C0201,C0301,C0302,C0330,W0105,W0107,W1202,W1203,R0902,R0913,R0914,
3231

3332
[IMPORTS]
3433
ignored-modules=aiohttp,defusedxml,gym,fetch,matplotlib,memory_profiler,numpy,oef,openapi_core,psutil,tensorflow,temper,skimage,vyper,web3
34+
35+
[DESIGN]
36+
min-public-methods=1
37+
max-public-methods=35

HISTORY.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,22 @@
11
# Release History
22

3+
## 0.6.2 (2020-10-01)
4+
5+
- Adds MultiAgentManager to manage multiple agent projects programmatically
6+
- Improves SOEF connection reliability on unregister
7+
- Extends configuration classes to handle overriding configurations programmatically
8+
- Improves configuration schemas and validations
9+
- Fixes Multiplexer termination errors
10+
- Allow finer-grained override of component configurations from aea-config
11+
- Fixes tac controller to work with Ethereum contracts again
12+
- Fixes multiple deploy and development scripts
13+
- Introduces isort to development dependencies for automated import sorting
14+
- Adds reset password command to CLI
15+
- Adds support for abbreviated public ids (latest) to CLI and configurations
16+
- Adds additional docstring linters for improved api documentation checks
17+
- Multiple docs updates including additional explanations of ACN architecture
18+
- Multiple additional tests and test stability fixes
19+
320
## 0.6.1 (2020-09-17)
421

522
- Adds a standalone script to deploy an ACN node

MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
include README.md LICENSE HISTORY.md AUTHORS.md SECURITY.md CODE_OF_CONDUCT.md Pipfile mkdocs.yml tox.ini pytest.ini strategy.ini
22

3-
recursive-include aea *.json *.yaml *.proto *.ico *png *.html *.js *.css *.md
3+
recursive-include aea *.json *.yaml *.proto *.ico *png *.html *.js *.css *.md *.cfg
44
recursive-include docs *
55
recursive-include examples *
66
recursive-include packages *

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ clean-test:
4141
.PHONY: lint
4242
lint:
4343
black aea benchmark examples packages scripts tests
44+
isort aea benchmark examples packages scripts tests
4445
flake8 aea benchmark examples packages scripts tests
4546
vulture aea scripts/whitelist.py --exclude "*_pb2.py"
4647

Pipfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ flake8 = "==3.7.9"
2020
flake8-bugbear = "==20.1.4"
2121
flake8-docstrings = "==1.5.0"
2222
flake8-eradicate = "==0.4.0"
23-
flake8-import-order = "==0.18.1"
23+
flake8-isort = "==4.0.0"
2424
gym = "==0.15.6"
2525
ipfshttpclient = "==0.6.1"
2626
liccheck = "==0.4.3"
@@ -40,7 +40,7 @@ pexpect = "==4.8.0"
4040
psutil = "==5.7.0"
4141
pydocstyle = "==3.0.0"
4242
pygments = "==2.5.2"
43-
pylint = "==2.5.2"
43+
pylint = "==2.6.0"
4444
pymdown-extensions = "==6.3"
4545
pynacl = "==1.3.0"
4646
pytest = "==5.4.3"
@@ -54,6 +54,7 @@ sqlalchemy = "==1.3.17"
5454
tox = "==3.15.1"
5555
vulture = "==2.1"
5656
vyper = "==0.1.0b12"
57+
isort = "==5.5.2"
5758

5859
[packages]
5960
# we don't specify dependencies for the library here for intallation as per: https://pipenv-fork.readthedocs.io/en/latest/advanced.html#pipfile-vs-setuppy

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,10 @@ The following steps are **only relevant if you intend to contribute** to the rep
142142

143143
tox -e black
144144

145+
- To run isort code formatter:
146+
147+
tox -e isort
148+
145149
- To run bandit security checks:
146150

147151
tox -e bandit

aea/__init__.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,17 @@
2121

2222
import inspect
2323
import os
24+
2425
import aea.crypto # triggers registry population
26+
from aea.__version__ import (
27+
__author__,
28+
__copyright__,
29+
__description__,
30+
__license__,
31+
__title__,
32+
__url__,
33+
__version__,
34+
)
2535

26-
from aea.__version__ import __title__, __description__, __url__, __version__
27-
from aea.__version__ import __author__, __license__, __copyright__
2836

2937
AEA_DIR = os.path.dirname(inspect.getfile(inspect.currentframe())) # type: ignore

aea/__version__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
__title__ = "aea"
2323
__description__ = "Autonomous Economic Agent framework"
2424
__url__ = "https://github.com/fetchai/agents-aea.git"
25-
__version__ = "0.6.1"
25+
__version__ = "0.6.2"
2626
__author__ = "Fetch.AI Limited"
2727
__license__ = "Apache-2.0"
2828
__copyright__ = "2019 Fetch.AI Limited"

aea/aea.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
from aea.protocols.default.message import DefaultMessage
5656
from aea.registries.filter import Filter
5757
from aea.registries.resources import Resources
58+
from aea.runtime import _StopRuntime
5859
from aea.skills.base import Behaviour, Handler
5960
from aea.skills.error.handlers import ErrorHandler
6061

@@ -241,8 +242,8 @@ def _get_msg_and_handlers_for_envelope(
241242

242243
if error_handler is None:
243244
self.logger.warning("ErrorHandler not initialized. Stopping AEA!")
244-
self.stop()
245-
return None, []
245+
raise _StopRuntime()
246+
246247
error_handler = cast(ErrorHandler, error_handler)
247248

248249
if protocol is None:
@@ -341,7 +342,7 @@ def get_message_handlers(self) -> List[Tuple[Callable[[Any], None], Callable]]:
341342
342343
:return: List of tuples of callables: handler and coroutine to get a message
343344
"""
344-
return super(AEA, self).get_message_handlers() + [
345+
return super().get_message_handlers() + [
345346
(self.filter.handle_internal_message, self.filter.get_internal_message,),
346347
]
347348

@@ -363,9 +364,10 @@ def log_exception(e, fn):
363364

364365
if self._skills_exception_policy == ExceptionPolicyEnum.stop_and_exit:
365366
log_exception(exception, function)
366-
self.stop()
367-
raise AEAException(
368-
f"AEA was terminated cause exception `{exception}` in skills {function}! Please check logs."
367+
raise _StopRuntime(
368+
AEAException(
369+
f"AEA was terminated cause exception `{exception}` in skills {function}! Please check logs."
370+
)
369371
)
370372

371373
if self._skills_exception_policy == ExceptionPolicyEnum.just_log:

0 commit comments

Comments
 (0)