Merge pull request #1135 from veox/run-trinity-integration-tests-with-py3.7

Run trinity integration tests with py3.7

Author: pipermerriam

.circleci/config.yml

@@ -52,12 +52,14 @@ jobs:
       - image: circleci/python:3.6
         environment:
           TOXENV: lint-py36
+
   py36-docs:
     <<: *common
     docker:
       - image: circleci/python:3.6
         environment:
           TOXENV: py36-docs
+
   py35-native-state-byzantium:
     <<: *common
     docker:
@@ -118,6 +120,7 @@ jobs:
       - image: circleci/python:3.5
         environment:
           TOXENV: py35-database
+
   py36-benchmark:
     <<: *common
     docker:
@@ -244,19 +247,36 @@ jobs:
       - image: circleci/python:3.6
         environment:
           TOXENV: py36-rpc-state-quadratic
+
   py37-core:
     <<: *common
     docker:
       - image: circleci/python:3.7
         environment:
           TOXENV: py37-core
+  py37-trinity:
+    <<: *common
+    docker:
+      - image: circleci/python:3.7
+        environment:
+          TOXENV: py37-trinity
+  py37-trinity-integration:
+    <<: *common
+    docker:
+      - image: circleci/python:3.7
+        environment:
+          TOXENV: py37-trinity-integration
 
 workflows:
   version: 2
   test:
     jobs:
-      - py37-core
       - py36-docs
+
+      - py37-core
+      - py37-trinity
+      - py37-trinity-integration
+
       - py36-native-state-byzantium
       - py36-native-state-frontier
       - py36-native-state-homestead
@@ -278,6 +298,7 @@ workflows:
       - py36-p2p
       - py36-database
       - py36-rpc-state-quadratic
+
       - py35-native-state-byzantium
       - py35-native-state-frontier
       - py35-native-state-homestead
@@ -288,5 +309,6 @@ workflows:
       - py35-core
       - py35-transactions
       - py35-database
+
       - lint-py35
       - lint-py36

tox.ini

@@ -1,11 +1,11 @@
 [tox]
 envlist=
-    py37-core
     py{35,36}-{core,database,transactions,vm,native-blockchain}
     py{36}-{benchmark,p2p,trinity}
     py{36}-rpc-blockchain
     py{36}-rpc-state-{frontier,homestead,eip150,eip158,byzantium,quadratic}
     py{35,36}-native-state-{frontier,homestead,eip150,eip158,byzantium,constantinople,metropolis}
+    py37-{core,trinity,trinity-integration}
     lint-py{35,36}
 
 [flake8]
@@ -53,17 +53,15 @@ basepython =
 whitelist_externals=
     make
 deps = .[doc]
-basepython=python3.6
 passenv =
     PYTEST_ADDOPTS
     TRAVIS_EVENT_TYPE
 commands=
     make validate-docs
 
 
-[testenv:py36-trinity-integration]
+[common-trinity-integration]
 deps = .[eth-extras, test]
-basepython=python3.6
 passenv =
     PYTEST_ADDOPTS
     TRAVIS_EVENT_TYPE
@@ -72,37 +70,47 @@ commands=
     # due to multiple Trinity instances competing for the same ports
     py.test -n 1 {posargs:tests/trinity/integration/}
 
+[testenv:py36-trinity-integration]
+deps = {[common-trinity-integration]deps}
+passenv = {[common-trinity-integration]passenv}
+commands = {[common-trinity-integration]commands}
+
+[testenv:py37-trinity-integration]
+deps = {[common-trinity-integration]deps}
+passenv = {[common-trinity-integration]passenv}
+commands = {[common-trinity-integration]commands}
+
 
 [testenv:py36-benchmark]
 deps = .[eth-extras, benchmark]
-basepython=python3.6
 commands=
     benchmark: {toxinidir}/scripts/benchmark/run.py
 
 
-[testenv:lint-py35]
+[common-lint]
 deps = .[lint]
-basepython=python3.5
 setenv=MYPYPATH={toxinidir}:{toxinidir}/stubs
 commands=
     flake8 {toxinidir}/eth
+
+[testenv:lint-py35]
+deps = {[common-lint]deps}
+setenv = {[common-lint]setenv}
+commands=
+    {[common-lint]commands}
     flake8 {toxinidir}/tests --exclude="trinity,p2p"
     # TODO: Drop --ignore-missing-imports once we have type annotations for eth_utils, coincurve and cytoolz
     mypy --follow-imports=silent --ignore-missing-imports --no-strict-optional --check-untyped-defs --disallow-incomplete-defs -p eth
 
-
 [testenv:lint-py36]
-deps = .[lint]
-basepython=python3.6
-setenv=MYPYPATH={toxinidir}:{toxinidir}/stubs
+deps = {[common-lint]deps}
+setenv = {[common-lint]setenv}
 commands=
-    flake8 {toxinidir}/eth
+    {[common-lint]commands}
+    flake8 {toxinidir}/tests
     flake8 {toxinidir}/p2p
     flake8 {toxinidir}/trinity
-    flake8 {toxinidir}/tests
     flake8 {toxinidir}/scripts
     # TODO: Drop --ignore-missing-imports once we have type annotations for eth_utils, coincurve and cytoolz
     mypy --follow-imports=silent --ignore-missing-imports --no-strict-optional --check-untyped-defs --disallow-incomplete-defs --disallow-untyped-defs --disallow-any-generics scripts/benchmark
     mypy --follow-imports=silent --ignore-missing-imports --no-strict-optional --check-untyped-defs --disallow-incomplete-defs --disallow-untyped-defs --disallow-any-generics -p p2p -p trinity
-
-