From 9939c60bc2d95d11b3a6f92b2327a1e1a123d675 Mon Sep 17 00:00:00 2001
From: Tom Augspurger <tom.w.augspurger@gmail.com>
Date: Wed, 29 Jan 2020 14:19:58 -0600
Subject: [PATCH 1/2] bump

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index acd7cc7..e3c98a2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # TO EDIT
-TAG ?= v0.25.1
+TAG ?= v1.0.0
 GH_USERNAME ?= TomAugspurger
 PANDAS_VERSION=$(TAG:v%=%)
 PANDAS_BASE_VERSION=$(shell echo $(PANDAS_VERSION) | awk -F '.' '{OFS="."} { print $$1, $$2}')

From 39ef777b71df5419794752437055f547c5091db4 Mon Sep 17 00:00:00 2001
From: Tom Augspurger <tom.w.augspurger@gmail.com>
Date: Thu, 30 Jan 2020 14:09:08 -0600
Subject: [PATCH 2/2] Fixups from 1.0

---
 Makefile        | 20 +++++---------------
 environment.yml |  7 +++++++
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index e3c98a2..08eb521 100644
--- a/Makefile
+++ b/Makefile
@@ -95,7 +95,7 @@ pip-test: pandas/dist/$(TARGZ)
 # subprocess.CalledProcessError: Command '('pdflatex', '-interaction=nonstopmode', 'pandas.tex')' returned non-zero exit status 1.
 
 doc:
-	docker run -it --rm \
+	docker run -it \
 		--name=pandas-docs \
 		-v ${CURDIR}/pandas:/pandas \
 		-v ${CURDIR}/scripts/build-docs.sh:/build-docs.sh \
@@ -116,23 +116,13 @@ link-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 . && \
-		git commit -m "RLS $(TAG)" && \
-		make html && \
+	pushd pandas/web && \
+		./pandas_web.py pandas
 	popd
 
 
-
-make push-website:
-	pushd pandas-website && \
-		git push upstream master && \
-		make html && \
-		make upload && \
-	popd
-
+push-website:
+	rsync  -ravzI -e ssh pandas/web/build/* pandas.pydata.org:/usr/share/nginx/pandas/
 
 push-tag:
 	pushd pandas && ../scripts/push-tag.py $(TAG) && popd
diff --git a/environment.yml b/environment.yml
index 59bbb8d..ca6b77e 100644
--- a/environment.yml
+++ b/environment.yml
@@ -9,3 +9,10 @@ dependencies:
     - conda-forge-pinning
     - lxml
     - twine
+    # web
+    - markdown
+    - feedparser
+    - pyyaml
+    - requests
+    - jinja2
+