Skip to content

Commit

Permalink
feat: update python version range to 3.8>=,3.11<=
Browse files Browse the repository at this point in the history
  • Loading branch information
angrybayblade committed Jul 14, 2023
1 parent 19be5ba commit cc48c9c
Show file tree
Hide file tree
Showing 18 changed files with 25 additions and 40 deletions.
6 changes: 1 addition & 5 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python_version: ['3.7', '3.8', '3.9', '3.10']
python_version: ['3.8', '3.9', '3.10', '3.11']
timeout-minutes: 120
steps:
- uses: actions/checkout@master
Expand Down Expand Up @@ -567,7 +567,3 @@ jobs:
- uses: actions/setup-go@v3
with:
go-version: "1.17.7"
# - if: matrix.python-version == '3.7'
# name: Golang unit tests (aealite)
# working-directory: ./libs/go/aealite
# run: go test -p 1 -timeout 0 -count 1 -v ./...
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ If you want to contribute, start working through the codebase, navigate to the G

First, setup your environment by either using the `develop-image` or by following these steps:

- The simplest way to get setup for development on the framework is to install Python `>=3.7` and `pipenv`, then run the following:
- The simplest way to get setup for development on the framework is to install Python `>=3.8` and `pipenv`, then run the following:

make new_env
pipenv shell
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ new_env: clean
then\
pipenv --rm;\
pipenv --clear;\
pipenv --python 3.10;\
pipenv --python 3.11;\
pipenv install --dev --skip-lock;\
pipenv run pip install -e .[all];\
pipenv run pip install --no-deps file:plugins/aea-ledger-ethereum;\
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ This is a fork of <a href="https://github.com/fetchai/agents-aea">the original A

## Get started developing AEAs

1. Create and launch a clean virtual environment with Python 3.10 (any Python `>=` 3.7 works):
1. Create and launch a clean virtual environment with Python 3.10 (any Python `>=` 3.8 works):

pipenv --python 3.10 && pipenv shell

Expand Down Expand Up @@ -96,7 +96,7 @@ You can have more control on the installed dependencies by leveraging the setupt

### Preliminaries

- Create and launch a virtual environment with Python 3.10 (any Python `>=` 3.7 works):
- Create and launch a virtual environment with Python 3.10 (any Python `>=` 3.8 works):

pipenv --python 3.10 && pipenv shell

Expand Down
4 changes: 3 additions & 1 deletion packages/valory/connections/p2p_libp2p_mailbox/connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@


try:
from asyncio.streams import IncompleteReadError # pylint: disable=ungrouped-imports
from asyncio.streams import ( # type: ignore # pylint: disable=ungrouped-imports
IncompleteReadError,
)
except ImportError: # pragma: nocover
from asyncio import IncompleteReadError # pylint: disable=ungrouped-imports

Expand Down
2 changes: 1 addition & 1 deletion plugins/aea-cli-benchmark/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@
"Operating System :: MacOS",
"Operating System :: Microsoft",
"Operating System :: Unix",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Topic :: Communications",
"Topic :: Internet",
"Topic :: Software Development",
Expand Down
2 changes: 1 addition & 1 deletion plugins/aea-cli-ipfs/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@
"Operating System :: MacOS",
"Operating System :: Microsoft",
"Operating System :: Unix",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Topic :: Communications",
"Topic :: Internet",
"Topic :: Software Development",
Expand Down
2 changes: 1 addition & 1 deletion plugins/aea-ledger-cosmos/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@
"Operating System :: MacOS",
"Operating System :: Microsoft",
"Operating System :: Unix",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Topic :: Communications",
"Topic :: Internet",
"Topic :: Software Development",
Expand Down
2 changes: 1 addition & 1 deletion plugins/aea-ledger-ethereum-flashbots/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@
"Operating System :: MacOS",
"Operating System :: Microsoft",
"Operating System :: Unix",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Topic :: Communications",
"Topic :: Internet",
"Topic :: Software Development",
Expand Down
2 changes: 1 addition & 1 deletion plugins/aea-ledger-ethereum-hwi/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@
"Operating System :: MacOS",
"Operating System :: Microsoft",
"Operating System :: Unix",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Topic :: Communications",
"Topic :: Internet",
"Topic :: Software Development",
Expand Down
2 changes: 1 addition & 1 deletion plugins/aea-ledger-ethereum/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@
"Operating System :: MacOS",
"Operating System :: Microsoft",
"Operating System :: Unix",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Topic :: Communications",
"Topic :: Internet",
"Topic :: Software Development",
Expand Down
2 changes: 1 addition & 1 deletion plugins/aea-ledger-fetchai/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@
"Operating System :: MacOS",
"Operating System :: Microsoft",
"Operating System :: Unix",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Topic :: Communications",
"Topic :: Internet",
"Topic :: Software Development",
Expand Down
1 change: 1 addition & 0 deletions plugins/aea-ledger-solana/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
"Operating System :: Unix",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Topic :: Communications",
"Topic :: Internet",
"Topic :: Software Development",
Expand Down
2 changes: 1 addition & 1 deletion scripts/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ function is_python_version_ok() {
version=`python3 -V 2>/dev/null`
if [[ -z `echo $version|grep -E 'Python 3\.(7|8|9|10)\.[0-9]+'` ]];
then
echo "Python3 version: ${version} is not supported. Supported versions are 3.7, 3.8, 3.9, 3.10."
echo "Python3 version: ${version} is not supported. Supported versions are 3.8, 3.9, 3.10."
return 1
fi
return 0
Expand Down
5 changes: 4 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ known_local_folder=tests
sections=FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,PACKAGES,LOCALFOLDER

[mypy]
python_version = 3.7
python_version = 3.8
strict_optional = True

# temporary until fixed
Expand Down Expand Up @@ -318,6 +318,9 @@ ignore_missing_imports=True
[mypy-flashbots.*]
ignore_missing_imports=True

[mypy-asyncio.*]
ignore_missing_imports=True

[darglint]
docstring_style=sphinx
strictness=short
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,10 @@ def parse_readme():
"Operating System :: MacOS",
"Operating System :: Microsoft",
"Operating System :: Unix",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Topic :: Communications",
"Topic :: Internet",
"Topic :: Scientific/Engineering",
Expand All @@ -132,7 +132,7 @@ def parse_readme():
zip_safe=False,
include_package_data=True,
license=about["__license__"],
python_requires=">=3.7",
python_requires=">=3.8",
keywords="aea open-aea autonomous-economic-agents agent-framework multi-agent-systems multi-agent cryptocurrency cryptocurrencies dezentralized dezentralized-network",
project_urls={
"Bug Reports": "https://github.com/valory-xyz/open-aea/issues",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ sudo apt-get dist-upgrade
sudo apt-get install pipenv
```
``` bash
pipenv --python 3.7 && pipenv shell
pipenv --python 3.8 && pipenv shell
```
``` bash
pip install aea[all]
Expand Down
19 changes: 1 addition & 18 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
; we set the associated flag (e.g. for linting we don't need
; the package installation).
[tox]
envlist = bandit, safety, black, black-check, isort, isort-check, fix-copyright, check-copyright, hash-check, docs, flake8, liccheck, mypy, pylint, vulture, {plugins-,}py{3.7,3.8,3.9,3.10,3.10-cov}, dependencies-check, package-version-checks, lock-packages, package-dependencies-checks, plugins_deps, fix-doc-hashes, check-doc-links-hashes, check-generate-all-protocols, spell-check, generate-api-documentation
envlist = bandit, safety, black, black-check, isort, isort-check, fix-copyright, check-copyright, hash-check, docs, flake8, liccheck, mypy, pylint, vulture, {plugins-,}py{3.8,3.9,3.10,3.10-cov,3.11}, dependencies-check, package-version-checks, lock-packages, package-dependencies-checks, plugins_deps, fix-doc-hashes, check-doc-links-hashes, check-generate-all-protocols, spell-check, generate-api-documentation
; when running locally we don't want to fail for no good reason
skip_missing_interpreters = true

Expand Down Expand Up @@ -391,16 +391,6 @@ passenv = *
extras = all
deps = {[tests-common]deps}

[testenv:py3.7]
basepython = python3.7
deps = {[testenv_multi]deps}
commands = {[test-framework]commands}

[testenv:packages-py3.7]
basepython = python3.7
deps = {[testenv_multi]deps}
commands = {[test-packages]commands}

[testenv:py3.8]
basepython = python3.8
deps = {[testenv_multi]deps}
Expand All @@ -421,13 +411,6 @@ basepython = python3.9
deps = {[testenv_multi]deps}
commands = {[test-packages]commands}

[testenv:plugins-py3.7]
basepython = python3.7
deps =
{[testenv_multi]deps}
pytest-custom-exit-code==0.3.0
commands = {[test-plugins]commands}

[testenv:plugins-py3.8]
basepython = python3.8
deps =
Expand Down

0 comments on commit cc48c9c

Please sign in to comment.