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

Commit 1506eab

Browse files
Merge pull request #31 from TomAugspurger/RLS-1.0.3
update for 1.0.3
2 parents 953b17b + ef70f37 commit 1506eab

File tree

7 files changed

+38
-46
lines changed

7 files changed

+38
-46
lines changed

Makefile

+6-14
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# TO EDIT
2-
TAG ?= v1.0.2
2+
TAG ?= v1.0.3
3+
34
GH_USERNAME ?= TomAugspurger
45
PANDAS_VERSION=$(TAG:v%=%)
56
PANDAS_BASE_VERSION=$(shell echo $(PANDAS_VERSION) | awk -F '.' '{OFS="."} { print $$1, $$2}')
@@ -70,7 +71,7 @@ conda-test:
7071
-v ${CURDIR}/pandas:/pandas \
7172
-v ${CURDIR}/recipe:/recipe \
7273
pandas-build \
73-
sh -c "conda build --numpy=1.13 --python=3.6 /recipe --output-folder=/pandas/dist"
74+
sh -c "conda build --numpy=1.17.3 --python=3.8 /recipe --output-folder=/pandas/dist"
7475

7576
pip-test: pandas/dist/$(TARGZ)
7677
docker run -it --rm \
@@ -83,17 +84,6 @@ pip-test: pandas/dist/$(TARGZ)
8384
# Docs
8485
# -----------------------------------------------------------------------------
8586

86-
# this had a non-zero exit, but seemed to succeed
87-
# Output written on pandas.pdf (2817 pages, 10099368 bytes).
88-
# Transcript written on pandas.log.
89-
# Traceback (most recent call last):
90-
# File "./make.py", line 372, in <module>
91-
# sys.exit(main())
92-
# ...
93-
# File "/opt/conda/envs/pandas/lib/python3.7/subprocess.py", line 347, in check_call
94-
# raise CalledProcessError(retcode, cmd)
95-
# subprocess.CalledProcessError: Command '('pdflatex', '-interaction=nonstopmode', 'pandas.tex')' returned non-zero exit status 1.
96-
9787
doc:
9888
docker run -it \
9989
--name=pandas-docs \
@@ -117,7 +107,9 @@ push-doc: | upload-doc link-stable link-version
117107

118108
website:
119109
pushd pandas/web && \
120-
./pandas_web.py pandas
110+
git checkout master && \
111+
git pull && \
112+
./pandas_web.py pandas && \
121113
popd
122114

123115

environment.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
name: pandas-release
22
channels:
3-
- defaults
43
- conda-forge
54
dependencies:
65
- packaging

recipe/meta.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,21 @@ requirements:
1818
host:
1919
- python
2020
- pip
21-
- cython
21+
- cython >=0.29.13
2222
- numpy
2323
run:
2424
- python
2525
- {{ pin_compatible('numpy') }}
26-
- python-dateutil >=2.5.*
27-
- pytz
26+
- python-dateutil >=2.6.1
27+
- pytz >=2017.2
2828

2929
test:
3030
requires:
3131
- pytest
3232
- pytest-mock
3333
- hypothesis
3434
commands:
35-
- python -c "import pandas; pandas.test()"
35+
- python -c "import pandas; pandas.test(extra_args=['-m not clipboard', '--skip-slow', '--skip-network', '--skip-db'])"
3636

3737
about:
3838
home: http://pandas.pydata.org

scripts/conda-forge.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ then
99
exit 1
1010
fi
1111

12-
conda install -y conda-build
13-
conda install -y -c conda-forge conda-smithy conda-forge-pinning
12+
conda install -y -c conda-forge conda-build conda-smithy conda-forge-pinning
1413

1514
PANDAS_VERSION="${1:1}"
1615
PANDAS_SHA=$(openssl dgst -sha256 pandas/dist/pandas-${PANDAS_VERSION}.tar.gz | cut -d ' ' -f 2)

scripts/download_wheels.py

+23-22
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
#!/usr/bin/env python
2-
"""Fetch wheels from wheels.scipy.org for a pandas version."""
2+
"""Fetch wheels from anaconda.org for a pandas version."""
33
import argparse
4-
import pathlib
4+
import io
5+
import os
56
import sys
6-
import urllib.parse
77
import urllib.request
88

9-
from lxml import html
9+
import requests
10+
import lxml.html
1011

1112

1213
def parse_args(args=None):
@@ -16,26 +17,26 @@ def parse_args(args=None):
1617

1718

1819
def fetch(version):
19-
base = "http://wheels.scipy.org"
20-
tree = html.parse(base)
21-
root = tree.getroot()
22-
23-
dest = pathlib.Path("dist")
24-
dest.mkdir(exist_ok=True)
25-
26-
files = [
27-
x
28-
for x in root.xpath("//a/text()")
29-
if x.startswith(f"pandas-{version}") and not dest.joinpath(x).exists()
20+
url = f"https://anaconda.org/multibuild-wheels-staging/pandas/files?version={version}"
21+
r = requests.get(url)
22+
t = io.StringIO(r.text)
23+
24+
root = lxml.html.parse(t).getroot()
25+
refs = root.xpath("/html/body/div[2]/div[2]/div/div[9]/div/form/table/tbody/tr/td[4]/a[2]")
26+
base = ("http://api.anaconda.org/download/multibuild-wheels-staging/"
27+
"pandas/{version}/{whl}")
28+
29+
urls = [
30+
base.format(version=version, whl=a.text)
31+
for a in refs
32+
if not a.text.endswith('\n')
3033
]
34+
N = len(urls)
3135

32-
N = len(files)
33-
34-
for i, filename in enumerate(files, 1):
35-
out = str(dest.joinpath(filename))
36-
link = urllib.request.urljoin(base, filename)
37-
urllib.request.urlretrieve(link, out)
38-
print(f"Downloaded {link} to {out} [{i}/{N}]")
36+
for i, url in enumerate(urls, 1):
37+
filename = os.path.join("pandas", "dist", url.split("/")[-1])
38+
urllib.request.urlretrieve(url, filename)
39+
print(f"Downloaded {url} to {filename} [{i}/{N}]")
3940

4041

4142
def main(args=None):

scripts/pip_test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ source activate pip-test
88

99
python3 -m pip wheel --no-deps --wheel-dir=/pandas/dist $1
1010
python3 -m pip install --no-deps --no-index --find-links=/pandas/dist --only-binary=pandas pandas
11-
python3 -c "import pandas; pandas.test()"
11+
python3 -c "import pandas; pandas.test(extra_args=['-m not clipboard', '--skip-slow', '--skip-network', '--skip-db'])"

scripts/wheels.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,10 @@ git pull upstream
2222
echo `git status`
2323
git checkout -B RLS-"${PANDAS_VERSION}"
2424

25-
sed -i 's/BUILD_COMMIT=v.*/BUILD_COMMIT='${PANDAS_VERSION}'/' .travis.yml
25+
sed -i 's/BUILD_COMMIT: "v.*/BUILD_COMMIT: "'${PANDAS_VERSION}'"/' azure/windows.yml
26+
sed -i 's/BUILD_COMMIT: "v.*/BUILD_COMMIT: "'${PANDAS_VERSION}'"/' azure/posix.yml
2627

27-
git add .travis.yml
28+
git add azure
2829
git commit -m "RLS $PANDAS_VERSION"
2930
git --no-pager diff HEAD~1
3031

0 commit comments

Comments
 (0)