Skip to content
This repository was archived by the owner on Jun 12, 2023. It is now read-only.

Commit f480526

Browse files
Merge pull request #32 from simonjayhawkins/windows-host
Scripts for Windows host and update for new website
2 parents 1506eab + e181902 commit f480526

File tree

6 files changed

+307
-43
lines changed

6 files changed

+307
-43
lines changed

Dockerfile

-2
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,3 @@ RUN apt-get update && \
66
RUN conda update conda -y \
77
&& conda install -y conda-build conda-verify gcc_linux-64 gxx_linux-64 \
88
&& conda clean --all
9-
10-
COPY pandas /pandas

Makefile

-14
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,12 @@ SHELL := /bin/bash
1515

1616
init-repos:
1717
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
18-
git clone https://github.com/pandas-dev/pandas-website && git -C pandas-website remote rename origin upstream && git -C pandas-website remote add origin https://github.com/$(GH_USERNAME)/pandas-website
1918
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
2019
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
2120

2221
update-repos:
2322
git -C pandas checkout master && git -C pandas pull
2423
git -C pandas-wheels checkout master && git -C pandas-wheels pull
25-
git -C pandas-website checkout master && git -C pandas-website pull
2624
git -C pandas-feedstock checkout master && git -C pandas-feedstock pull
2725
pushd pandas-wheels && git submodule update --recursive --remote && popd
2826

@@ -105,17 +103,6 @@ link-version:
105103

106104
push-doc: | upload-doc link-stable link-version
107105

108-
website:
109-
pushd pandas/web && \
110-
git checkout master && \
111-
git pull && \
112-
./pandas_web.py pandas && \
113-
popd
114-
115-
116-
push-website:
117-
rsync -ravzI -e ssh pandas/web/build/* pandas.pydata.org:/usr/share/nginx/pandas/
118-
119106
push-tag:
120107
pushd pandas && ../scripts/push-tag.py $(TAG) && popd
121108

@@ -136,7 +123,6 @@ wheels:
136123

137124
download-wheels:
138125
./scripts/download_wheels.py $(PANDAS_VERSION)
139-
# TODO: Fetch from https://www.lfd.uci.edu/~gohlke/pythonlibs/
140126

141127

142128
upload-pypi:

README.md

+5-26
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
Release automation for pandas.
22

3+
**Windows users should follow the steps in `windows.md`**
4+
35
## Steps to a release
46

57
- [ ] Manually update
@@ -73,17 +75,14 @@ Docs. You can cheat and re-tag / rebuild these if needed.
7375
make doc
7476
```
7577

76-
Once the binaries finish, you'll need to manually upload the
77-
wheels to PyPI. Assuming the job which `make wheels` triggered on MacPython completed successfully (you may want to double check this)
78-
you can download a copy of the wheels for Mac / Linux locally.
78+
Once the binaries finish, you'll need to manually upload the wheels to PyPI.
7979

80+
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.
8081

8182
```
8283
make download-wheels
8384
```
8485

85-
Christoph Gohlke builds the windows wheels. Fetch from from https://www.lfd.uci.edu/~gohlke/pythonlibs/ and download to the same `dist` directory.
86-
8786
Upload the wheels and sdist
8887

8988
```
@@ -94,41 +93,21 @@ Finalize the docs
9493

9594
```
9695
make upload-doc
97-
make website
9896
```
9997

100-
You also need to make edits to the pandas-website to appropriately display items.
101-
Ideally this could be done via `make push-website` as the rule exists but the
102-
intermediary steps aren't fully automated yet.
98+
To make sure /stable and the latest minor revision point to the new release run the following.
10399

104-
```sh
105-
pushd pandas-website
106-
mv latest.rst previous.rst
107-
# Recreate latest.rst to match release notes from GH in earlier steps
108-
# Update pre_release.json and releases.json
109-
git commit -am "Your updates"
110-
git push
111-
make html
112-
make upload
113100
```
114-
115-
To make sure /stable and the latest minor revision point to the new release run the following from root
116-
117-
```sh
118-
popd # should bring us back to root from pandas-website
119101
make link-stable
120102
make link-version
121103
```
122104

123-
Now check pandas.pydata.org and ensure the sidebar and links are correct!
124-
125105
goto announce.
126106

127107

128108

129109
# Finalize
130110

131-
- [ ] Download Christoph's wheels and upload to PyPI
132111
- [ ] Announce Mailing List
133112
- [ ] Announce Twitter
134113

docker-files/windows/Dockerfile

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
FROM continuumio/miniconda3:latest
2+
3+
RUN apt-get update && \
4+
apt-get install -y make rsync && \
5+
apt-get clean
6+
7+
RUN conda update conda -y
8+
9+
RUN git clone https://github.com/pandas-dev/pandas-release
10+
11+
RUN conda env update -n base --file=pandas-release/environment.yml
12+
13+
ARG GH_USERNAME
14+
15+
ENV GH_USERNAME=$GH_USERNAME
16+
17+
WORKDIR pandas-release
18+
19+
RUN make init-repos
20+
21+
RUN git config --global user.email "[email protected]"
22+
23+
RUN git config --global user.name "Pandas Development Team"

scripts/pip_test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22
set -e
33

4-
# Cytyhon is *not* required here.
4+
# Cython is *not* required here.
55
conda create -n pip-test -y python=3.7 numpy pytz python-dateutil pytest pytest-mock hypothesis nomkl
66

77
source activate pip-test

0 commit comments

Comments
 (0)