Updates

* handle rc branch
* update docker-doc image build

Closes #9

Author: TomAugspurger

Makefile

@@ -1,5 +1,5 @@
 # TO EDIT
-TAG ?= v0.24.2
+TAG ?= v0.25.0rc0
 GH_USERNAME ?= jorisvandenbossche
 
 PANDAS_VERSION=$(TAG:v%=%)  # like 0.24.2

docker-files/docs/Dockerfile

@@ -1,11 +1,9 @@
 FROM continuumio/miniconda3:latest
 
-RUN apt-get update && apt-get install -y texlive-full \
+RUN apt-get update && apt-get install -y texlive-full xclip \
  && apt-get clean
 COPY pandas /pandas
-RUN conda env create --file=/pandas/ci/deps/travis-36-doc.yaml --name=pandas \
+RUN conda env create --file=/pandas/environment.yaml --name=pandas \
  && . activate pandas \
- && conda uninstall -y --force pandas ||:
-# TODO: combine with tex install when you rebuild
-RUN apt-get install -y xclip \
- && apt-get clean
+ && conda uninstall -y --force pandas \
+ || true python setup.py build_ext -j 4

scripts/build-docs.sh

@@ -11,7 +11,6 @@ conda uninstall -y --force pandas ||:
 # 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 && pip install -e .
 
 cd /pandas/doc
 

scripts/push-tag.py

@@ -18,7 +18,15 @@ def check_tag(tag):
 
 
 def get_branch(tag):
-    if tag[-1] == '0':
+    """
+    >>> get_branch("v0.24.0rc0")
+    'master'
+    >>> get_branch("v0.24.0")
+    'master'
+    >>> get_branch("v0.24.1")
+    """
+    ver = version.parse(tag.lstrip('v'))
+    if ver.base_version[-1] == '0':
         # off master
         base = 'master'
     else: