Merge branch 'master' into brettlangdon/dd.version.logging

.circleci/config.yml

@@ -749,12 +749,13 @@ jobs:
   deploy_dev:
     # build the master branch releasing development docs and wheels
     docker:
-      - image: circleci/python:3.6
+      - image: circleci/python:3.8
     resource_class: *resource_class
     steps:
       - checkout
       - run: sudo apt-get -y install rake
-      - run: sudo pip install mkwheelhouse sphinx awscli
+      - run: pip install tox mkwheelhouse awscli
+      - run: tox -e docs
       - run: S3_DIR=trace-dev rake release:docs
       - run: S3_DIR=trace-dev rake release:wheel
 
@@ -794,14 +795,12 @@ jobs:
   build_docs:
     # deploy official documentation
     docker:
-      - image: circleci/python:3.6
+      - image: circleci/python:3.8
     resource_class: *resource_class
     steps:
       - checkout
-      - run: sudo apt-get -y install rake
-      # Sphinx 1.7.5 is required otherwise docs are not properly built
-      - run: sudo pip install mkwheelhouse sphinx==1.7.5 wrapt
-      - run: rake docs
+      - run: pip install tox
+      - run: tox -e docs
       - run:
           command: |
              mkdir -p /tmp/docs

Rakefile

@@ -1,11 +1,3 @@
-desc "build the docs"
-task :docs do
-    sh "pip install sphinx"
-  Dir.chdir 'docs' do
-    sh "make html"
-  end
-end
-
 # Deploy tasks
 S3_DIR = ENV['S3_DIR']
 S3_BUCKET = "pypi.datadoghq.com"

tox.ini

@@ -514,6 +514,13 @@ deps=
 commands=flake8 .
 basepython=python3.7
 
+[testenv:docs]
+commands_pre=
+skip_install=true
+deps = sphinx
+commands = sphinx-build -b html docs docs/_build/html
+basepython = python
+
 # do not use develop mode with celery as running multiple python versions within
 # same job will cause problem for tests that use ddtrace-run
 [celery_contrib]