Skip to content

Commit

Permalink
Merge pull request #910 from fetchai/develop
Browse files Browse the repository at this point in the history
Release v0.2.2
  • Loading branch information
DavidMinarsch authored Mar 9, 2020
2 parents b991004 + bca2767 commit bc4f65f
Show file tree
Hide file tree
Showing 237 changed files with 8,628 additions and 4,729 deletions.
60 changes: 60 additions & 0 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
name: AEA framework sanity checks and tests

on:
push:
branches:
- develop
- master
pull_request:

jobs:
run:
runs-on: ${{ matrix.os }}

strategy:
matrix:
os: [ubuntu-latest]
python-version: [3.6, 3.7, 3.8]

timeout-minutes: 30

steps:
- uses: actions/checkout@master
- uses: actions/setup-python@master
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
pip install pipenv
pip install tox
- name: Security Check - Main
run: tox -e bandit-main
- name: Security Check - Tests
run: tox -e bandit-tests
- name: Safety Check
run: tox -e safety
- name: License Check
run: tox -e liccheck
- name: Copyright Check
run: tox -e copyright_check
- name: Code style check
run: |
tox -e black-check
tox -e flake8
- name: Static type check
run: tox -e mypy
- name: Unit tests and coverage
run: |
tox -e py${{ matrix.python-version }} -- --no-integration-tests --ci
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v1
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: ./coverage.xml
flags: unittests
name: codecov-umbrella
yml: ./codecov.yml
fail_ci_if_error: true
- name: Generate Documentation
run: tox -e docs

2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ wheels/
.installed.cfg
*.egg
MANIFEST
Pipfile.lock

# PyInstaller
# Usually these files are written by a python script from a template
Expand Down Expand Up @@ -104,6 +105,7 @@ venv.bak/
.mypy_cache/

*.sqlite3
pip-wheel-metadata/

.DS_Store
*/.DS_Store
Expand Down
4 changes: 4 additions & 0 deletions AUTHORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@ This is the official list of Fetch.AI authors for copyright purposes.

* Marco Favorito <marco.favorito@fetch.ai> [MarcoFavorito](https://github.com/MarcoFavorito)
* David Minarsch <david.minarsch@fetch.ai> [DavidMinarsch](https://github.com/DavidMinarsch)
* Ali Hosseini <ali.hosseini@fetch.ai> [5A11](https://github.com/5A11)
* Aristotelis Triantafyllidis <aristotelis.triantafyllidis@fetch.ai> [Totoual](https://github.com/Totoual)
* Diarmid Campbell <diarmid.campbell@fetch.ai> [dishmop](https://github.com/dishmop)
* Oleg Panasevych <oleg.panasevych@n-cube.co.uk> [Panasevychol](https://github.com/panasevychol)
14 changes: 14 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# Release History

## 0.2.2 (2020-03-09)

- Fixes registry to only load registered packages
- Migrates default protocol to generator produced version
- Adds http connection and http protocol
- Adds cli init command for easier setting of author
- Refactoring and behind the scenes improvements to CLI
- Multiple docs updates
- Protocol generator improvements and fixes
- Adds cli launch command to launch multiple agents
- Increases test coverage for aea package and tests package
- Make project comply with PEP 518
- Multiple additional minor fixes and changes

## 0.2.1 (2020-02-21)

- Add minimal aea install
Expand Down
136 changes: 0 additions & 136 deletions Jenkinsfile

This file was deleted.

9 changes: 7 additions & 2 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
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 aea *.json *.yaml
recursive-include docs *
recursive-include examples *
recursive-include packages *
recursive-include scripts *
recursive-include tests *
66 changes: 62 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,25 +1,33 @@
.PHONY: clean
clean: clean-build clean-pyc clean-test clean-docs

.PHONY: clean-build
clean-build:
rm -fr build/
rm -fr dist/
rm -fr .eggs/
rm -fr pip-wheel-metadata
find . -name '*.egg-info' -exec rm -fr {} +
find . -name '*.egg' -exec rm -fr {} +
rm -fr Pipfile.lock

.PHONY: clean-docs
clean-docs:
rm -fr site/

.PHONY: clean-pyc
clean-pyc:
find . -name '*.pyc' -exec rm -f {} +
find . -name '*.pyo' -exec rm -f {} +
find . -name '*~' -exec rm -f {} +
find . -name '__pycache__' -exec rm -fr {} +

.PHONY: clean-test
clean-test:
rm -fr .tox/
rm -f .coverage
rm -fr .coverage*
rm -fr coverage.xml
rm -fr htmlcov/
rm -fr .hypothesis
rm -fr .pytest_cache
Expand All @@ -29,16 +37,66 @@ clean-test:
find . -name 'log.txt' -exec rm -fr {} +
find . -name 'log.*.txt' -exec rm -fr {} +

.PHONY: lint
lint:
flake8 aea tests
black aea examples packages scripts tests
flake8 aea examples packages scripts tests

.PHONY: security
security:
bandit -s B101 -r aea packages scripts
bandit -s B101 -r tests
safety check

.PHONY: static
static:
mypy aea packages tests scripts

.PHONY: test
test:
pytest --doctest-modules aea packages/fetchai/protocols packages/fetchai/connections tests/ --cov-report=html --cov-report=xml --cov-report=term --cov=aea --cov=packages/fetchai/protocols --cov=packages/fetchai/connections
rm -fr .coverage*

.PHONY: test-all
test-all:
tox

.PHONY: install
install: clean
python3 setup.py install

.PHONY: dist
dist: clean
python setup.py sdist
python setup.py bdist_wheel
ls -l dist

install: clean
python3 setup.py install
h := $(shell git rev-parse --abbrev-ref HEAD)

.PHONY: release_check
release:
if [ "$h" = "master" ];\
then\
echo "Please ensure everything is merged into master & tagged there";\
pip install twine;\
twine upload dist/*;\
else\
echo "Please change to master branch for release.";\
fi

v := $(shell pip -V | grep -r virtualenvs)

.PHONY: new_env
new_env: clean
if [ "$v" == "" ];\
then\
pipenv --rm;\
pipenv --python 3.7;\
echo "Enter clean virtual environment now: 'pipenv shell'.";\
else\
echo "In a virtual environment! Exit first: 'exit'.";\
fi

.PHONY: install_env
install_env:
pipenv install --dev
pip install -e .[all]
Loading

0 comments on commit bc4f65f

Please sign in to comment.