fixups

Author: TomAugspurger

Makefile

@@ -84,6 +84,17 @@ pip-test: pandas/dist/$(TARGZ)
 # Docs
 # -----------------------------------------------------------------------------
 
+# this had a non-zero exit, but seemed to succeed
+# Output written on pandas.pdf (2817 pages, 10099368 bytes).
+# Transcript written on pandas.log.
+# Traceback (most recent call last):
+#   File "./make.py", line 372, in <module>
+#     sys.exit(main())
+#   ...
+#   File "/opt/conda/envs/pandas/lib/python3.7/subprocess.py", line 347, in check_call
+#     raise CalledProcessError(retcode, cmd)
+# subprocess.CalledProcessError: Command '('pdflatex', '-interaction=nonstopmode', 'pandas.tex')' returned non-zero exit status 1.
+
 doc:
 	docker run -it --rm \
 		--name=pandas-docs \
@@ -96,10 +107,18 @@ doc:
 upload-doc:
 	rsync -rv -e ssh pandas/doc/build/html/            pandas.pydata.org:/usr/share/nginx/pandas/pandas-docs/version/$(PANDAS_VERSION)/
 	rsync -rv -e ssh pandas/doc/build/latex/pandas.pdf pandas.pydata.org:/usr/share/nginx/pandas/pandas-docs/version/$(PANDAS_VERSION)/pandas.pdf
-	ssh pandas.pydata.org "cd /usr/share/nginx/pandas/pandas-docs && ln -sfn version/$(PANDAS_VERSION) stable && cd version && ln -sfn $(PANDAS_VERSION) $(PANDAS_BASE_VERSION)"
+	sudo chgrp -R docs /usr/share/nginx/pandas/pandas-docs
+
+link-stable:
+	ssh pandas.pydata.org "cd /usr/share/nginx/pandas/pandas-docs && ln -sfn version/$(PANDAS_VERSION) stable"
+
+link-version:
+	ssh pandas.pydata.org "cd /usr/share/nginx/pandas/pandas-docs/version && ln -sfn $(PANDAS_VERSION) $(PANDAS_BASE_VERSION)"
 
+push-doc: | upload-doc link-stable link-version
 
 website:
+	# TODO: handle previous.rst, latest.rst
 	pushd pandas-website && \
 		../scripts/update-website.py $(TAG) && \
 		git add . && \

scripts/build-docs.sh

@@ -11,6 +11,7 @@ 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 -j 4
 
 cd /pandas/doc
 

scripts/conda-forge.sh

@@ -9,8 +9,8 @@ then
 	exit 1
 fi
 
-conda update -y conda-build
-conda update -y -c conda-forge conda-smithy conda-forge-pinning
+conda install -y conda-build
+conda install -y -c conda-forge conda-smithy conda-forge-pinning
 
 PANDAS_VERSION="${1:1}"
 PANDAS_SHA=$(openssl dgst -sha256 pandas/dist/pandas-${PANDAS_VERSION}.tar.gz | cut -d ' ' -f 2)
@@ -20,7 +20,11 @@ pushd pandas-feedstock
 git remote set-url upstream https://github.com/conda-forge/pandas-feedstock
 git remote set-url origin https://github.com/${GH_USERNAME}/pandas-feedstock
 
-git checkout master
+if [[ ${PANDAS_VERSION} == *"rc"* ]]; then
+    git checkout dev
+else
+    git checkout master
+fi
 git pull upstream
 
 echo `git status`

scripts/update-website.py

@@ -26,7 +26,7 @@ def update_releases(tag):
 
     if 'rc' in tag:
         data = {
-            'version': tag[1:],
+            'version': tag[1:].split("rc")[0],
             'date': date
         }
         with open("pre_release.json", "w") as f: