Dev.req (celery#5803)

* update  docker config



* undo hardpin

* devr req install from github master

docker/Dockerfile

@@ -1,9 +1,9 @@
-FROM debian:stretch
+FROM debian:buster
 
 ENV PYTHONIOENCODING UTF-8
 
 # Pypy is installed from a package manager because it takes so long to build.
-RUN apt-get update && apt-get install -y build-essential \
+RUN apt update && apt install -y build-essential \
     libcurl4-openssl-dev \
     libffi-dev \
     tk-dev \
@@ -61,37 +61,37 @@ COPY --chown=1000:1000 docker/entrypoint /entrypoint
 RUN chmod gu+x /entrypoint
 
 # Define the local pyenvs
-RUN pyenv local python3.6 python3.5 python3.4 python2.7 python3.7
+RUN pyenv local python3.8 python3.7 python3.6 python3.5 python2.7
 
 RUN pyenv exec python2.7 -m pip install --upgrade pip setuptools && \
-    pyenv exec python3.4 -m pip install --upgrade pip setuptools && \
     pyenv exec python3.5 -m pip install --upgrade pip setuptools && \
     pyenv exec python3.6 -m pip install --upgrade pip setuptools && \
-    pyenv exec python3.7 -m pip install --upgrade pip setuptools
+    pyenv exec python3.7 -m pip install --upgrade pip setuptools && \
+    pyenv exec python3.8 -m pip install --upgrade pip setuptools
 
 # Setup one celery environment for basic development use
-RUN pyenv exec python3.7 -m pip install \
+RUN pyenv exec python3.8 -m pip install \
   -r requirements/default.txt \
   -r requirements/test.txt \
   -r requirements/test-ci-default.txt \
   -r requirements/docs.txt \
   -r requirements/test-integration.txt \
   -r requirements/pkgutils.txt && \
-  pyenv exec python3.6 -m pip install \
+  pyenv exec python3.7 -m pip install \
   -r requirements/default.txt \
   -r requirements/test.txt \
   -r requirements/test-ci-default.txt \
   -r requirements/docs.txt \
   -r requirements/test-integration.txt \
   -r requirements/pkgutils.txt && \
-  pyenv exec python3.5 -m pip install \
+  pyenv exec python3.6 -m pip install \
   -r requirements/default.txt \
   -r requirements/test.txt \
   -r requirements/test-ci-default.txt \
   -r requirements/docs.txt \
   -r requirements/test-integration.txt \
   -r requirements/pkgutils.txt && \
-  pyenv exec python3.4 -m pip install \
+  pyenv exec python3.5 -m pip install \
   -r requirements/default.txt \
   -r requirements/test.txt \
   -r requirements/test-ci-default.txt \

docker/docker-compose.yml

@@ -27,10 +27,10 @@ services:
       - azurite
 
   rabbit:
-    image: rabbitmq:3.7.3
+    image: rabbitmq:3.8.0
 
   redis:
-    image: redis:3.2.11
+    image: redis:5.0.6
 
   dynamodb:
     image: dwmkerr/dynamodb:38

docker/scripts/install-pyenv.sh

@@ -7,8 +7,8 @@ curl -L https://raw.githubusercontent.com/pyenv/pyenv-installer/master/bin/pyenv
 git clone https://github.com/s1341/pyenv-alias.git $(pyenv root)/plugins/pyenv-alias
 
 # Python versions to test against
-VERSION_ALIAS="python2.7" pyenv install 2.7.15
-VERSION_ALIAS="python3.4" pyenv install 3.4.9
-VERSION_ALIAS="python3.5" pyenv install 3.5.6
-VERSION_ALIAS="python3.6" pyenv install 3.6.7
-VERSION_ALIAS="python3.7" pyenv install 3.7.1
+VERSION_ALIAS="python2.7" pyenv install 2.7.17
+VERSION_ALIAS="python3.5" pyenv install 3.5.8
+VERSION_ALIAS="python3.6" pyenv install 3.6.9
+VERSION_ALIAS="python3.7" pyenv install 3.7.5
+VERSION_ALIAS="python3.8" pyenv install 3.8.0

requirements/default.txt

@@ -1,4 +1,4 @@
 pytz>dev
 billiard>=3.6.1,<4.0
-kombu==4.6.5
+kombu>=4.6.5,<4.7
 vine==1.3.0

requirements/dev.txt

@@ -0,0 +1,5 @@
+pytz>dev
+git+https://github.com/celery/kombu.git
+git+https://github.com/celery/py-amqp.git
+git+https://github.com/celery/billiard.git
+vine==1.3.0