diff --git a/AUTHORS.md b/AUTHORS.md index 59ff2f0488..f1d6a446cf 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -4,3 +4,7 @@ This is the official list of Fetch.AI authors for copyright purposes. * Marco Favorito [MarcoFavorito](https://github.com/MarcoFavorito) * David Minarsch [DavidMinarsch](https://github.com/DavidMinarsch) +* Ali Hosseini [5A11](https://github.com/5A11) +* Aristotelis Triantafyllidis [Totoual](https://github.com/Totoual) +* Diarmid Campbell [dishmop](https://github.com/dishmop) +* Oleg Panasevych [Panasevychol](https://github.com/panasevychol) diff --git a/MANIFEST.in b/MANIFEST.in index 1d143bcf7c..5ea8f7baee 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1,4 @@ -include README.md LICENSE Pipfile Pipfile.lock +include README.md LICENSE HISTORY.md AUTHORS.md Pipfile mkdocs.yml tox.ini pytest.ini strategy.ini -recursive-include aea * +recursive-include docs * +recursive-include tests * diff --git a/pyproject.toml b/pyproject.toml index 7a2081a051..4618ca7559 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ['setuptools', "wheel"] -build_backend = 'setuptools.build_meta' +requires = ["setuptools", "wheel"] +build_backend = "setuptools.build_meta" diff --git a/scripts/generate_private_key.py b/scripts/generate_private_key.py deleted file mode 100755 index 5d11120be4..0000000000 --- a/scripts/generate_private_key.py +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2018-2019 Fetch.AI Limited -# -# 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. -# -# ------------------------------------------------------------------------------ - -""" -Generate a private key to be used for the Trading Agent Competition. - -It prints the key in PEM format to the specified file. -""" - -import argparse - -from aea.crypto.fetchai import FetchAICrypto - -parser = argparse.ArgumentParser("generate_private_key", description=__doc__) -parser.add_argument("out_file", type=str, help="Where to save the private key.") - -if __name__ == "__main__": - args = parser.parse_args() - - crypto = FetchAICrypto() - file = open(args.out_file, "wb") - crypto.dump(file) diff --git a/setup.cfg b/setup.cfg index 3da27dd08b..ae775c5bab 100644 --- a/setup.cfg +++ b/setup.cfg @@ -15,32 +15,12 @@ select = C,E,F,I,W,B901,B902,B903,B301,B302,B303,B304,B305,B306,B001,B002,B003,B ignore = E203,E501,W503,D202,B009,B014 application-import-names = aea,packages,tests -# Global options: - [mypy] python_version = 3.7 strict_optional = True # Per-module options for aea dir: -[mypy-base58] -ignore_missing_imports = True - -[mypy-cryptography.exceptions] -ignore_missing_imports = True - -[mypy-cryptography.hazmat.primitives] -ignore_missing_imports = True - -[mypy-cryptography.hazmat.backends] -ignore_missing_imports = True - -[mypy-cryptography.hazmat.primitives.asymmetric] -ignore_missing_imports = True - -[mypy-cryptography.hazmat.primitives.serialization] -ignore_missing_imports = True - [mypy-click_log] ignore_missing_imports = True @@ -50,10 +30,7 @@ ignore_missing_imports = True [mypy-jsonschema] ignore_missing_imports = True -[mypy-watchdog.events] -ignore_missing_imports = True - -[mypy-watchdog.observers] +[mypy-watchdog.*] ignore_missing_imports = True [mypy-dotenv] @@ -74,9 +51,6 @@ ignore_missing_imports = True [mypy-eth_keys.*] ignore_missing_imports = True -[mypy-hexbytes] -ignore_missing_imports = True - [mypy-fetch.*] ignore_missing_imports = True @@ -93,13 +67,10 @@ ignore_missing_imports = True [mypy-pytest] ignore_missing_imports = True -[mypy-docker] -ignore_missing_imports = True - -[mypy-docker.models.containers] +[mypy-docker.*] ignore_missing_imports = True -# Package ignores +# Per-module options for packages dir: [mypy-packages/fetchai/protocols/fipa/fipa_pb2] ignore_errors = True @@ -107,9 +78,6 @@ ignore_errors = True [mypy-packages/fetchai/protocols/tac/tac_pb2] ignore_errors = True -[mypy-psycopg2] -ignore_missing_imports = True - [mypy-tensorflow.*] ignore_missing_imports = True diff --git a/setup.py b/setup.py index c1ebe2be20..2850ed5722 100644 --- a/setup.py +++ b/setup.py @@ -124,16 +124,26 @@ def get_all_extras() -> Dict: long_description_content_type='text/markdown', packages=find_packages(include=["aea*"]), classifiers=[ + 'Environment :: Console', + 'Environment :: Web Environment', 'Development Status :: 2 - Pre-Alpha', 'Intended Audience :: Developers', - 'Natural Language :: English', 'License :: OSI Approved :: Apache Software License', + 'Natural Language :: English', + 'Operating System :: MacOS', + 'Operating System :: Microsoft', + 'Operating System :: Unix', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', + 'Topic :: Communications', + 'Topic :: Internet', + 'Topic :: Scientific/Engineering', + 'Topic :: Software Development', + 'Topic :: System', ], install_requires=base_deps, - tests_require=["tox"], + tests_require=['tox'], extras_require=all_extras, entry_points={ 'console_scripts': ["aea=aea.cli:cli"],