From 7e49a19f58e30e47126f170420d1721d6985369a Mon Sep 17 00:00:00 2001 From: Chris Sewell Date: Wed, 16 Sep 2020 15:44:09 +0100 Subject: [PATCH 1/3] Use -e install for tox runs Improves startup time for test runs --- pyproject.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index e535691248..d771ab8b6c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,6 +15,9 @@ legacy_tox_ini = """ [tox] envlist = py37-django +[testenv] +usedevelop=True + [testenv:py{35,36,37,38}-{django,sqla}] deps = py35: -rrequirements/requirements-py-3.5.txt From 41758b5517cca1aeecff7245039d0fc891ace1a4 Mon Sep 17 00:00:00 2001 From: Chris Sewell Date: Thu, 17 Sep 2020 21:39:25 +0100 Subject: [PATCH 2/3] Create docker-rabbitmq.yml --- .ci/docker-rabbitmq.yml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .ci/docker-rabbitmq.yml diff --git a/.ci/docker-rabbitmq.yml b/.ci/docker-rabbitmq.yml new file mode 100644 index 0000000000..894f81f587 --- /dev/null +++ b/.ci/docker-rabbitmq.yml @@ -0,0 +1,29 @@ +# A small configuration for use in local CI testing, +# if you wish to control the rabbitmq used. + +# Simply install docker, then run: +# $ docker-compose -f .ci/docker-rabbitmq.yml up -d + +# and to power down, after testing: +# $ docker-compose -f .ci/docker-rabbitmq.yml down + +# you can monitor rabbitmq use at: http://localhost:15672 + +version: '3.4' + +services: + + rabbit: + image: rabbitmq:3.8.3-management + container_name: aiida-rmq + environment: + RABBITMQ_DEFAULT_USER: guest + RABBITMQ_DEFAULT_PASS: guest + ports: + - '5672:5672' + - '15672:15672' + healthcheck: + test: rabbitmq-diagnostics -q ping + interval: 30s + timeout: 30s + retries: 5 From 76afcdf9443b5cea2b5965efe5421be46d83e2b0 Mon Sep 17 00:00:00 2001 From: Chris Sewell Date: Wed, 30 Sep 2020 10:18:26 +0100 Subject: [PATCH 3/3] Update pyproject.toml Co-authored-by: Sebastiaan Huber --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index c521a58f1c..30f55e5170 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -71,7 +71,7 @@ envlist = py37-django [testenv] usedevelop=True -[testenv:py{35,36,37,38}-{django,sqla}] +[testenv:py{36,37,38}-{django,sqla}] deps = py36: -rrequirements/requirements-py-3.6.txt py37: -rrequirements/requirements-py-3.7.txt