[wip] 1.1.5/1.2.0rc0 releases

Dockerfile

@@ -6,3 +6,18 @@ RUN apt-get update && \
 RUN conda update conda -y \
  && conda install -y conda-build conda-verify gcc_linux-64 gxx_linux-64 \
  && conda clean --all
+
+# ARG USER_ID
+# ARG GROUP_ID
+
+# RUN addgroup --gid $GROUP_ID user
+# RUN adduser --disabled-password --gecos '' --uid $USER_ID --gid $GROUP_ID user
+
+# # https://github.com/ContinuumIO/docker-images/issues/151
+# RUN mkdir /opt/conda/envs/user && \
+#     chgrp user /opt/conda/pkgs && \
+#     chmod g+w /opt/conda/pkgs && \
+#     touch /opt/conda/pkgs/urls.txt && \
+#     chown user /opt/conda/envs/user /opt/conda/pkgs/urls.txt
+
+# USER user

Makefile

@@ -1,7 +1,8 @@
 # TO EDIT
-TAG ?= v1.1.4
-
+# TAG ?= v1.2.0rc0
+TAG ?= v1.1.5
 GH_USERNAME ?= simonjayhawkins
+
 PANDAS_VERSION=$(TAG:v%=%)
 PANDAS_BASE_VERSION=$(shell echo $(PANDAS_VERSION) | awk -F '.' '{OFS="."} { print $$1, $$2}')
 TARGZ=pandas-$(PANDAS_VERSION).tar.gz
@@ -14,15 +15,12 @@ SHELL := /bin/bash
 # -----------------------------------------------------------------------------
 
 init-repos:
-	git clone https://github.com/pandas-dev/pandas                   && git -C pandas           remote rename origin upstream && git -C pandas 		     remote add origin https://github.com/$(GH_USERNAME)/pandas
-	git clone https://github.com/conda-forge/pandas-feedstock        && git -C pandas-feedstock remote rename origin upstream && git -C pandas-feedstock remote add origin https://github.com/$(GH_USERNAME)/pandas-feedstock
-	git clone --recursive https://github.com/MacPython/pandas-wheels && git -C pandas-wheels    remote rename origin upstream && git -C pandas-wheels    remote add origin https://github.com/$(GH_USERNAME)/pandas-wheels
+	git clone https://github.com/pandas-dev/pandas       && git -C pandas           remote rename origin upstream && git -C pandas 		     remote add origin https://github.com/$(GH_USERNAME)/pandas
+	git clone https://github.com/MacPython/pandas-wheels && git -C pandas-wheels    remote rename origin upstream && git -C pandas-wheels    remote add origin https://github.com/$(GH_USERNAME)/pandas-wheels
 
 update-repos:
 	git -C pandas checkout master           && git -C pandas pull
 	git -C pandas-wheels checkout master    && git -C pandas-wheels pull
-	git -C pandas-feedstock checkout master && git -C pandas-feedstock pull
-	pushd pandas-wheels && git submodule update --recursive --remote && popd
 
 # -----------------------------------------------------------------------------
 # Git Tag
@@ -37,10 +35,11 @@ tag:
 #  Builder Images
 # -----------------------------------------------------------------------------
 
-docker-image: pandas
+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 .
 
@@ -49,13 +48,14 @@ docker-doc:
 # sdist
 # -----------------------------------------------------------------------------
 
-pandas/dist/$(TARGZ):
+sdist:
 	docker run -it --rm \
 		--name=pandas-sdist-build \
 		-v ${CURDIR}/pandas:/pandas \
 		-v ${CURDIR}/scripts:/scripts \
 		pandas-build \
 		sh /scripts/build_sdist.sh
+	sudo chown -R $(shell id -u):$(shell id -g) pandas/dist/
 
 # -----------------------------------------------------------------------------
 # Tests

README.md

@@ -4,6 +4,11 @@ Release automation for pandas.
 
 ## Steps to a release
 
+The `environment.yml` contains the local dependencies. You'll
+also need docker.
+
+And fork pandas-feedstock and pandas-wheels to your GitHub account.
+
 - [  ] Manually update
   - [  ] `TAG` in `Makefile`
   - [  ] `GH_USERNAME` in `Makefile`
@@ -14,11 +19,6 @@ If running for the first time be sure to initialize repos
 make init-repos
 ```
 
-The `environment.yml` contains the local dependencies. You'll
-also need docker.
-
-And fork pandas-feedstock and pandas-wheels to your GitHub account.
-
 ```
 # Update repos
 make update-repos
@@ -30,7 +30,7 @@ make tag
 make docker-image docker-doc
 
 # Build the sdist
-make pandas/dist/<>.tar.gz
+make sdist
 
 # Final Pip and Conda tests. Do these in parallel.
 # You can optionally do make doc here as well
@@ -41,6 +41,22 @@ make conda-test
 make push-tag
 ```
 
+Start the binary build.  **For Mac users** you may need to download the GNU version of sed before running this scripts via `brew install gnu-sed`
+
+```
+make wheels
+```
+
+Open PRs for each of those.
+
+Note that `make wheels` actually pushes a job to MacPython to produce wheels which we will download later.
+
+Docs. You can cheat and re-tag / rebuild these if needed.
+
+```
+make doc
+```
+
 Now manually create a release https://github.com/pandas-dev/pandas/releases
 
 Make sure to upload the sdist that's in `pandas/dist/` as the "binary".
@@ -57,24 +73,6 @@ git tag -a v<NEXT_TAG>.dev0 -m 'DEV: Start <NEXT_TAG> cycle'
 git push upstream master --follow-tags
 ```
 
-Start the binary builds.  **For Mac users** you may need to download the GNU version of sed before running this scripts via `brew install gnu-sed`
-
-```
-# Binaries
-make conda-forge
-make wheels
-```
-
-Open PRs for each of those.
-
-Note that `make wheels` actually pushes a job to MacPython to produce wheels which we will download later.
-
-Docs. You can cheat and re-tag / rebuild these if needed.
-
-```
-make doc
-```
-
 Once the binaries finish, you'll need to manually upload the wheels to PyPI.
 
 Assuming the job which `make wheels` triggered on MacPython completed successfully (you may want to double check this https://anaconda.org/multibuild-wheels-staging/pandas/files) you can download a copy of the wheels locally.

windows-wsl.md

@@ -63,6 +63,7 @@ configure git manually
 ```
 git config --global user.email "<your-email>"
 git config --global user.name "<your-name>"
+git config --global pull.rebase false
 ```
 
 or copy the configuration from windows.
@@ -112,10 +113,10 @@ find /mnt/c/ -name "chrome.exe" 2>/dev/null
 
 then open index.html in the browser
 ```
-"/mnt/c/Program Files/Google/Chrome/Application/chrome.exe" pandas/doc/build/html/index.html
+"/mnt/c/Program Files (x86)/Google/Chrome/Application/chrome.exe" pandas/doc/build/html/index.html
 ```
 
 and the same for the pdf documentation
 ```
-"/mnt/c/Program Files/Google/Chrome/Application/chrome.exe" pandas/doc/build/latex/pandas.pdf
+"/mnt/c/Program Files (x86)/Google/Chrome/Application/chrome.exe" pandas/doc/build/latex/pandas.pdf
 ```