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

Update release process for Windows hosts #33

Draft
wants to merge 34 commits into
base: master
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
5b5f63f
Update release process for Windows hosts
simonjayhawkins Aug 21, 2020
68de0e7
wip - updates during 1.1.2 release
simonjayhawkins Sep 8, 2020
d5521ab
1.1.2 -> 1.1.3
simonjayhawkins Oct 5, 2020
3cac915
Merge remote-tracking branch 'upstream/master' into release-1.1.1
simonjayhawkins Oct 24, 2020
ac09b98
updates to windows.md
simonjayhawkins Oct 26, 2020
ccede2b
wip - add WSL 2 instructions
simonjayhawkins Oct 27, 2020
dfab0cf
wip - add WSL 2 instructions
simonjayhawkins Oct 28, 2020
e3cc626
wip - add WSL 2 instructions
simonjayhawkins Oct 30, 2020
6582d10
[wip] 1.1.5/1.2.0rc0 releases
simonjayhawkins Nov 25, 2020
2486d19
[wip] prep 1.2.0rc0 release
simonjayhawkins Nov 29, 2020
893dcd2
[wip] prep 1.2.0rc0 release
simonjayhawkins Dec 5, 2020
ab38edf
[wip] prep 1.2.0rc0 release
simonjayhawkins Dec 16, 2020
33d26bd
remove windows host instructions (not WSL)
simonjayhawkins Dec 18, 2020
8a8e5b1
[wip] prep 1.2.0 release
simonjayhawkins Dec 21, 2020
851f300
changes for 1.2.0 release
simonjayhawkins Jan 1, 2021
512ca6d
[wip] release 1.2.1
simonjayhawkins Jan 20, 2021
5cbdd73
update for 1.2.2
simonjayhawkins Feb 7, 2021
91a1926
update README.md
simonjayhawkins Feb 13, 2021
8c21c1e
release 1.2.3
simonjayhawkins Mar 2, 2021
e9e5f21
update TAG to v1.2.4
simonjayhawkins Apr 10, 2021
c8b68de
update for v1.3.0rc1
simonjayhawkins Jun 13, 2021
54d0118
updates for conda-forge PR
simonjayhawkins Jun 16, 2021
83c86df
update for 1.3.1
simonjayhawkins Jul 24, 2021
043d799
update for 1.3.3
simonjayhawkins Sep 22, 2021
5e0b063
update for 1.3.4
simonjayhawkins Oct 20, 2021
42f6d16
add conda package cache for doc container build
simonjayhawkins Nov 7, 2021
14f386a
fix doc build deleting sdist
simonjayhawkins Nov 26, 2021
8d3c6a2
v1.4.0rc0 prep
simonjayhawkins Jan 3, 2022
477807d
1.4.0rc release
simonjayhawkins Jan 10, 2022
d28823e
v1.4.0 prep
simonjayhawkins Jan 19, 2022
d2e88cc
update Makefile
simonjayhawkins Jan 22, 2022
fe83a5d
1.4.1 release
simonjayhawkins Apr 2, 2022
3c94d71
v1.4.2 release
simonjayhawkins Apr 6, 2022
1ff3688
v1.4.3 release prep
simonjayhawkins Jun 15, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
v1.4.0 prep
simonjayhawkins committed Jan 19, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit d28823eacf5a10da3a81ad731bd1e6ce01aeeb78
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# TO EDIT
TAG ?= v1.4.0rc0
TAG ?= v1.4.0
GH_USERNAME ?= simonjayhawkins

PANDAS_VERSION=$(TAG:v%=%)
@@ -26,7 +26,7 @@ init-repos:


update-repos:
git -C pandas checkout master && git -C pandas pull
git -C pandas checkout main && 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

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -54,10 +54,10 @@ make push-tag
cd pandas
git checkout -b 1.4.x
git push upstream 1.4.x
git checkout master
git checkout main
git commit --allow-empty -m "Start 1.5.0"
git tag -a v1.5.0.dev0 -m 'DEV: Start 1.5.0'
git push upstream master --follow-tags
git push upstream main --follow-tags
cd ..
```

6 changes: 5 additions & 1 deletion docker-files/docs/Dockerfile
Original file line number Diff line number Diff line change
@@ -5,4 +5,8 @@ RUN apt-get update && apt-get install -y texlive-full xclip \

COPY pandas /pandas

RUN --mount=type=cache,target=/opt/conda/pkgs conda env create --file=/pandas/environment.yml --name=pandas
RUN --mount=type=cache,target=/opt/conda/pkgs conda update conda -n base -y

RUN --mount=type=cache,target=/opt/conda/pkgs conda install mamba -n base -c conda-forge -y

RUN --mount=type=cache,target=/opt/conda/pkgs mamba env create --file=/pandas/environment.yml --name=pandas
6 changes: 3 additions & 3 deletions scripts/push-tag.py
Original file line number Diff line number Diff line change
@@ -20,16 +20,16 @@ def check_tag(tag):
def get_branch(tag):
"""
>>> get_branch("v0.24.0rc0")
'master'
'main'
>>> get_branch("v0.24.0")
'0.24.x'
>>> get_branch("v0.24.1")
'0.24.x'
"""
ver = version.parse(tag.lstrip('v'))
if 'rc0' in tag:
# off master
base = 'master'
# off main
base = 'main'
else:
base = '.'.join([tag[1:].rsplit('.', 1)[0], 'x'])

4 changes: 2 additions & 2 deletions scripts/tag.py
Original file line number Diff line number Diff line change
@@ -23,8 +23,8 @@ def check_tag(tag):

def checkout(tag):
if 'rc0' in tag:
# off master
base = 'master'
# off main
base = 'main'
else:
base = '.'.join([tag[1:].rsplit('.', 1)[0], 'x'])