Skip to content

Commit

Permalink
Merge pull request #291 from fetchai/develop
Browse files Browse the repository at this point in the history 
Release v0.1.10
  • Loading branch information
@DavidMinarsch
DavidMinarsch authored Oct 19, 2019
2 parents 9865a44 + a46d097 commit 9a46690
Show file tree
Hide file tree
Showing 14 changed files with 520 additions and 336 deletions.
6 changes: 6 additions & 0 deletions HISTORY.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,9 @@ Release History
- Stability improvements
- Higher test coverage, including on Python 3.6
- Multiple additional minor fixes and changes

0.1.10 (2019-10-19)
-------------------

- Compatibility fixes for Ubuntu and Windows platforms
- Multiple additional minor fixes and changes
2 changes: 1 addition & 1 deletion aea/__version__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
__title__ = 'aea'
__description__ = 'Autonomous Economic Agent framework'
__url__ = 'https://github.com/fetchai/agents-aea.git'
__version__ = '0.1.9'
__version__ = '0.1.10'
__author__ = 'Fetch.AI Limited'
__license__ = 'Apache 2.0'
__copyright__ = '2019 Fetch.AI Limited'
175 changes: 108 additions & 67 deletions aea/configurations/schemas/aea-config_schema.json
View file
Original file line number Diff line number Diff line change
@@ -1,73 +1,114 @@
{
"$schema": "http://json-schema.org/draft-04/schema#",
"description": "Schema for the agent configuration file.",
"additionalProperties": false,
"type": "object",
"required": [
"aea_version",
"agent_name",
"authors",
"version",
"license",
"url",
"private_key_paths",
"connections",
"default_connection",
"protocols",
"skills"
],
"properties": {
"aea_version": {"type": "string"},
"agent_name": {"type": "string"},
"authors": {"type": "string"},
"version": {"type": "string"},
"license": {"type": "string"},
"url": {"type": "string"},
"registry_path": {"type": "string"},
"private_key_paths": {
"type": "array",
"additionalProperties": false,
"uniqueItems": true,
"items": {
"type": "object",
"required": ["private_key_path"],
"properties": {
"private_key_path": { "$ref": "#/definitions/private_key_path" }
}
}
},
"connections": {
"type": "array",
"uniqueItems": true,
"items": {"$ref": "definitions.json#/definitions/resource_name"}
},
"default_connection": {"type": "string"},
"protocols": {
"type": "array",
"uniqueItems": true,
"items": {"$ref": "definitions.json#/definitions/resource_name"}
},
"skills": {
"type": "array",
"uniqueItems": true,
"items": {"type": "string"}
},
"logging_config": {
"type": "object"
},
"description": {
"type": "string"
"$schema": "http://json-schema.org/draft-04/schema#",
"description": "Schema for the agent configuration file.",
"additionalProperties": false,
"type": "object",
"required": [
"aea_version",
"agent_name",
"authors",
"version",
"license",
"url",
"private_key_paths",
"connections",
"default_connection",
"protocols",
"skills"
],
"properties": {
"aea_version": {
"type": "string"
},
"agent_name": {
"type": "string"
},
"authors": {
"type": "string"
},
"version": {
"type": "string"
},
"license": {
"type": "string"
},
"url": {
"type": "string"
},
"registry_path": {
"type": "string"
},
"private_key_paths": {
"type": "array",
"additionalProperties": false,
"uniqueItems": true,
"items": {
"type": "object",
"required": [
"private_key_path"
],
"properties": {
"private_key_path": {
"$ref": "#/definitions/private_key_path"
}
}
}
},
"connections": {
"type": "array",
"uniqueItems": true,
"items": {
"$ref": "#/definitions/resource_name"
}
},
"default_connection": {
"type": "string"
},
"protocols": {
"type": "array",
"uniqueItems": true,
"items": {
"$ref": "#/definitions/resource_name"
}
},
"skills": {
"type": "array",
"uniqueItems": true,
"items": {
"type": "string"
}
},
"definitions": {
"private_key_path": {
"type": "object",
"additionalProperties": false,
"required": ["ledger", "path"],
"properties": {
"ledger": {"type": "string"},
"path": {"type": "string"}
}
"logging_config": {
"type": "object"
},
"description": {
"type": "string"
}
},
"definitions": {
"private_key_path": {
"type": "object",
"additionalProperties": false,
"required": [
"ledger",
"path"
],
"properties": {
"ledger": {
"type": "string"
},
"path": {
"type": "string"
}
}
},
"requirement": {
"type": "string",
"pattern": "([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9._-]*[a-zA-Z0-9])( *(~=|==|>=|<=|!=|<|>) *v?(?:(?:(?P<epoch>[0-9]+)!)?(?P<release>[0-9]+(?:\\.[0-9]+)*)(?P<pre>[-_\\.]?(?P<pre_l>(a|b|c|rc|alpha|beta|pre|preview))[-_\\.]?(?P<pre_n>[0-9]+)?)?(?P<post>(?:-(?P<post_n1>[0-9]+))|(?:[-_\\.]?(?P<post_l>post|rev|r)[-_\\.]?(?P<post_n2>[0-9]+)?))?(?P<dev>[-_\\.]?(?P<dev_l>dev)[-_\\.]?(?P<dev_n>[0-9]+)?)?)(?:\\+(?P<local>[a-z0-9]+(?:[-_\\.][a-z0-9]+)*))?)?$"
},
"resource_name": {
"type": "string",
"pattern": "[a-zA-Z_][a-zA-Z0-9_]*"
}
}
}
96 changes: 63 additions & 33 deletions aea/configurations/schemas/connection-config_schema.json
View file
Original file line number Diff line number Diff line change
@@ -1,36 +1,66 @@
{
"$schema": "http://json-schema.org/draft-04/schema#",
"description": "Schema for the connection configuration file.",
"additionalProperties": false,
"type": "object",
"required": [
"name",
"authors",
"version",
"license",
"url",
"class_name",
"supported_protocols",
"config"
],
"properties": {
"name": {"$ref": "definitions.json#/definitions/resource_name"},
"authors": {"type": "string"},
"version": {"type": "string"},
"license": {"type": "string"},
"url": {"type": "string"},
"class_name": {"type": "string"},
"supported_protocols": {
"type": "array",
"uniqueItems": true,
"items": {"type": "string"}
},
"config": {"type": "object"},
"dependencies": {
"type": "array",
"uniqueItems": true,
"items": { "$ref": "definitions.json#/definitions/requirement" }
},
"description": {"type": "string"}
"$schema": "http://json-schema.org/draft-04/schema#",
"description": "Schema for the connection configuration file.",
"additionalProperties": false,
"type": "object",
"required": [
"name",
"authors",
"version",
"license",
"url",
"class_name",
"supported_protocols",
"config"
],
"properties": {
"name": {
"$ref": "#/definitions/resource_name"
},
"authors": {
"type": "string"
},
"version": {
"type": "string"
},
"license": {
"type": "string"
},
"url": {
"type": "string"
},
"class_name": {
"type": "string"
},
"supported_protocols": {
"type": "array",
"uniqueItems": true,
"items": {
"type": "string"
}
},
"config": {
"type": "object"
},
"dependencies": {
"type": "array",
"uniqueItems": true,
"items": {
"$ref": "#/definitions/requirement"
}
},
"description": {
"type": "string"
}
},
"definitions": {
"requirement": {
"type": "string",
"pattern": "([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9._-]*[a-zA-Z0-9])( *(~=|==|>=|<=|!=|<|>) *v?(?:(?:(?P<epoch>[0-9]+)!)?(?P<release>[0-9]+(?:\\.[0-9]+)*)(?P<pre>[-_\\.]?(?P<pre_l>(a|b|c|rc|alpha|beta|pre|preview))[-_\\.]?(?P<pre_n>[0-9]+)?)?(?P<post>(?:-(?P<post_n1>[0-9]+))|(?:[-_\\.]?(?P<post_l>post|rev|r)[-_\\.]?(?P<post_n2>[0-9]+)?))?(?P<dev>[-_\\.]?(?P<dev_l>dev)[-_\\.]?(?P<dev_n>[0-9]+)?)?)(?:\\+(?P<local>[a-z0-9]+(?:[-_\\.][a-z0-9]+)*))?)?$"
},
"resource_name": {
"type": "string",
"pattern": "[a-zA-Z_][a-zA-Z0-9_]*"
}
}
}
70 changes: 47 additions & 23 deletions aea/configurations/schemas/protocol-config_schema.json
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,50 @@
{
"$schema": "http://json-schema.org/draft-04/schema#",
"description": "Schema for the protocol configuration file.",
"additionalProperties": false,
"type": "object",
"required": [
"name",
"authors",
"version",
"license",
"url"
],
"properties": {
"name": {"$ref": "definitions.json#/definitions/resource_name"},
"authors": {"type": "string"},
"version": {"type": "string"},
"license": {"type": "string"},
"url": {"type": "string"},
"dependencies": {
"type": "array",
"uniqueItems": true,
"items": { "$ref": "definitions.json#/definitions/requirement" }
},
"description": {"type": "string"}
"$schema": "http://json-schema.org/draft-04/schema#",
"description": "Schema for the protocol configuration file.",
"additionalProperties": false,
"type": "object",
"required": [
"name",
"authors",
"version",
"license",
"url"
],
"properties": {
"name": {
"$ref": "#/definitions/resource_name"
},
"authors": {
"type": "string"
},
"version": {
"type": "string"
},
"license": {
"type": "string"
},
"url": {
"type": "string"
},
"dependencies": {
"type": "array",
"uniqueItems": true,
"items": {
"$ref": "#/definitions/requirement"
}
},
"description": {
"type": "string"
}
},
"definitions": {
"requirement": {
"type": "string",
"pattern": "([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9._-]*[a-zA-Z0-9])( *(~=|==|>=|<=|!=|<|>) *v?(?:(?:(?P<epoch>[0-9]+)!)?(?P<release>[0-9]+(?:\\.[0-9]+)*)(?P<pre>[-_\\.]?(?P<pre_l>(a|b|c|rc|alpha|beta|pre|preview))[-_\\.]?(?P<pre_n>[0-9]+)?)?(?P<post>(?:-(?P<post_n1>[0-9]+))|(?:[-_\\.]?(?P<post_l>post|rev|r)[-_\\.]?(?P<post_n2>[0-9]+)?))?(?P<dev>[-_\\.]?(?P<dev_l>dev)[-_\\.]?(?P<dev_n>[0-9]+)?)?)(?:\\+(?P<local>[a-z0-9]+(?:[-_\\.][a-z0-9]+)*))?)?$"
},
"resource_name": {
"type": "string",
"pattern": "[a-zA-Z_][a-zA-Z0-9_]*"
}
}
}
Loading

0 comments on commit 9a46690

Please sign in to comment.