From 97761e0078df309cb29dcd29f0e0be392de8a6cf Mon Sep 17 00:00:00 2001 From: Mark Gibbs Date: Sun, 3 May 2020 07:33:55 -0700 Subject: [PATCH 1/5] Reconcile build error with python version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d6147e3c..9ddbffd2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ dist: xenial language: python python: - - "3.7" + - "3.6" cache: - pip From 39ae552a70f7114d461773ae56d27153c54abcf5 Mon Sep 17 00:00:00 2001 From: Mark Gibbs Date: Sun, 3 May 2020 07:47:39 -0700 Subject: [PATCH 2/5] Remove daphne --- dev_requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev_requirements.txt b/dev_requirements.txt index 63c51ccf..4dfb8be6 100644 --- a/dev_requirements.txt +++ b/dev_requirements.txt @@ -1,7 +1,7 @@ coveralls>=1.6.0 channels>=2.0 channels-redis -daphne +#daphne Django>=2.0 django-bootstrap4 django-redis From dd0d8647f3699f7b6660d3da6e88b60b35ab51e6 Mon Sep 17 00:00:00 2001 From: Mark Gibbs Date: Sun, 3 May 2020 07:57:56 -0700 Subject: [PATCH 3/5] Try to work around unwanted import of daphne, inflicted by standard import of channels --- .travis.yml | 1 + dev_requirements.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 9ddbffd2..40c5f7a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,7 @@ cache: install: - pip install -r requirements.txt + - pip install --no-deps channels - pip install -r dev_requirements.txt - python setup.py develop diff --git a/dev_requirements.txt b/dev_requirements.txt index 4dfb8be6..4834799c 100644 --- a/dev_requirements.txt +++ b/dev_requirements.txt @@ -1,3 +1,4 @@ +asgiref coveralls>=1.6.0 channels>=2.0 channels-redis From ce8fee52dd9e22d0d7b3c9f75e0c1a95386b2f7e Mon Sep 17 00:00:00 2001 From: Mark Gibbs Date: Sun, 3 May 2020 08:07:12 -0700 Subject: [PATCH 4/5] Suppress direct install of channels --- dev_requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev_requirements.txt b/dev_requirements.txt index 4834799c..ba5bd034 100644 --- a/dev_requirements.txt +++ b/dev_requirements.txt @@ -1,6 +1,6 @@ asgiref coveralls>=1.6.0 -channels>=2.0 +#channels>=2.0 channels-redis #daphne Django>=2.0 From 47749e2e298e92e8df533513aa7fb9d78e6db9d2 Mon Sep 17 00:00:00 2001 From: Mark Gibbs Date: Sun, 3 May 2020 22:40:18 -0700 Subject: [PATCH 5/5] Set up build with current packages --- .travis.yml | 1 - dev_requirements.txt | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 40c5f7a3..9ddbffd2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,6 @@ cache: install: - pip install -r requirements.txt - - pip install --no-deps channels - pip install -r dev_requirements.txt - python setup.py develop diff --git a/dev_requirements.txt b/dev_requirements.txt index ba5bd034..d185829a 100644 --- a/dev_requirements.txt +++ b/dev_requirements.txt @@ -1,8 +1,9 @@ asgiref +attrs==19.3.0 coveralls>=1.6.0 -#channels>=2.0 +channels>=2.0 channels-redis -#daphne +daphne Django>=2.0 django-bootstrap4 django-redis