add conda package cache for doc container build

Makefile

@@ -1,5 +1,5 @@
 # TO EDIT
-TAG ?= v1.3.4
+TAG ?= v1.3.5
 GH_USERNAME ?= simonjayhawkins
 
 PANDAS_VERSION=$(TAG:v%=%)
@@ -45,11 +45,8 @@ tag:
 
 docker-image:
 	docker build -t pandas-build .
-	# docker build -t pandas-build \
-	# 	--build-arg USER_ID=$(shell id -u) \
-	# 	--build-arg GROUP_ID=$(shell id -g) .
 docker-doc:
-	docker build -t pandas-docs -f docker-files/docs/Dockerfile .
+	DOCKER_BUILDKIT=1 docker build --progress=plain -t pandas-docs -f docker-files/docs/Dockerfile .
 
 
 # -----------------------------------------------------------------------------

README.md

@@ -27,9 +27,10 @@ make update-repos
 make tag
 
 # Build the doc and test images
-make docker-image docker-doc
+make docker-image
+make docker-doc # seperate terminal - takes 10-20 mins to solve env
 
-# Build the sdist
+# Build the sdist (can do this in parallel with building docker-doc image above)
 make sdist
 
 # Final Pip and Conda tests. Do these in parallel.
@@ -41,6 +42,10 @@ make doc
 ./build-docs.sh
 exit
 
+# Visually check docs
+python -m http.server --directory pandas/doc/build/html/
+python -m http.server --directory pandas/doc/build/latex/
+
 # Push the tag. No going back now.
 make push-tag
 

docker-files/docs/Dockerfile

@@ -3,12 +3,6 @@ FROM continuumio/miniconda3:latest
 RUN apt-get update && apt-get install -y texlive-full xclip \
  && apt-get clean
 
-RUN apt-get update && apt-get install -y build-essential \
- && apt-get clean
-
 COPY pandas /pandas
 
-RUN conda env create --file=/pandas/environment.yml --name=pandas \
- && . activate pandas \
- && conda uninstall -y --force pandas \
- || true python setup.py build_ext -j 4
+RUN --mount=type=cache,target=/opt/conda/pkgs conda env create --file=/pandas/environment.yml --name=pandas

scripts/build-docs.sh

@@ -4,14 +4,10 @@ set -e
 source activate pandas
 conda uninstall -y --force pandas ||:
 
-# this should have been built by pip-test
-# ugh that's 3.7, this is 3.6. boooooo
-# actually, can't really do that, since we upload the
-# dist folder to PyPI, and we don't want to upload this one...
-# python3 -m pip install --no-deps --no-index --find-links=/pandas/dist --only-binary=pandas pandas
-apt-get update && apt-get install -y build-essential
 cd /pandas
-python setup.py build_ext -i -j 4
+
+python setup.py clean
+python setup.py build_ext -j 4
 
 cd /pandas/doc