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

update for 1.0.3 #31

Merged
merged 1 commit into from
Mar 18, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 6 additions & 14 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# TO EDIT
TAG ?= v1.0.2
TAG ?= v1.0.3

GH_USERNAME ?= TomAugspurger
PANDAS_VERSION=$(TAG:v%=%)
PANDAS_BASE_VERSION=$(shell echo $(PANDAS_VERSION) | awk -F '.' '{OFS="."} { print $$1, $$2}')
Expand Down Expand Up @@ -70,7 +71,7 @@ conda-test:
-v ${CURDIR}/pandas:/pandas \
-v ${CURDIR}/recipe:/recipe \
pandas-build \
sh -c "conda build --numpy=1.13 --python=3.6 /recipe --output-folder=/pandas/dist"
sh -c "conda build --numpy=1.17.3 --python=3.8 /recipe --output-folder=/pandas/dist"

pip-test: pandas/dist/$(TARGZ)
docker run -it --rm \
Expand All @@ -83,17 +84,6 @@ pip-test: pandas/dist/$(TARGZ)
# Docs
# -----------------------------------------------------------------------------

# this had a non-zero exit, but seemed to succeed
# Output written on pandas.pdf (2817 pages, 10099368 bytes).
# Transcript written on pandas.log.
# Traceback (most recent call last):
# File "./make.py", line 372, in <module>
# sys.exit(main())
# ...
# File "/opt/conda/envs/pandas/lib/python3.7/subprocess.py", line 347, in check_call
# raise CalledProcessError(retcode, cmd)
# subprocess.CalledProcessError: Command '('pdflatex', '-interaction=nonstopmode', 'pandas.tex')' returned non-zero exit status 1.

doc:
docker run -it \
--name=pandas-docs \
Expand All @@ -117,7 +107,9 @@ push-doc: | upload-doc link-stable link-version

website:
pushd pandas/web && \
./pandas_web.py pandas
git checkout master && \
git pull && \
./pandas_web.py pandas && \
popd


Expand Down
1 change: 0 additions & 1 deletion environment.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
name: pandas-release
channels:
- defaults
- conda-forge
dependencies:
- packaging
Expand Down
8 changes: 4 additions & 4 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,21 @@ requirements:
host:
- python
- pip
- cython
- cython >=0.29.13
- numpy
run:
- python
- {{ pin_compatible('numpy') }}
- python-dateutil >=2.5.*
- pytz
- python-dateutil >=2.6.1
- pytz >=2017.2

test:
requires:
- pytest
- pytest-mock
- hypothesis
commands:
- python -c "import pandas; pandas.test()"
- python -c "import pandas; pandas.test(extra_args=['-m not clipboard', '--skip-slow', '--skip-network', '--skip-db'])"

about:
home: http://pandas.pydata.org
Expand Down
3 changes: 1 addition & 2 deletions scripts/conda-forge.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ then
exit 1
fi

conda install -y conda-build
conda install -y -c conda-forge conda-smithy conda-forge-pinning
conda install -y -c conda-forge conda-build conda-smithy conda-forge-pinning

PANDAS_VERSION="${1:1}"
PANDAS_SHA=$(openssl dgst -sha256 pandas/dist/pandas-${PANDAS_VERSION}.tar.gz | cut -d ' ' -f 2)
Expand Down
45 changes: 23 additions & 22 deletions scripts/download_wheels.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
#!/usr/bin/env python
"""Fetch wheels from wheels.scipy.org for a pandas version."""
"""Fetch wheels from anaconda.org for a pandas version."""
import argparse
import pathlib
import io
import os
import sys
import urllib.parse
import urllib.request

from lxml import html
import requests
import lxml.html


def parse_args(args=None):
Expand All @@ -16,26 +17,26 @@ def parse_args(args=None):


def fetch(version):
base = "http://wheels.scipy.org"
tree = html.parse(base)
root = tree.getroot()

dest = pathlib.Path("dist")
dest.mkdir(exist_ok=True)

files = [
x
for x in root.xpath("//a/text()")
if x.startswith(f"pandas-{version}") and not dest.joinpath(x).exists()
url = f"https://anaconda.org/multibuild-wheels-staging/pandas/files?version={version}"
r = requests.get(url)
t = io.StringIO(r.text)

root = lxml.html.parse(t).getroot()
refs = root.xpath("/html/body/div[2]/div[2]/div/div[9]/div/form/table/tbody/tr/td[4]/a[2]")
base = ("http://api.anaconda.org/download/multibuild-wheels-staging/"
"pandas/{version}/{whl}")

urls = [
base.format(version=version, whl=a.text)
for a in refs
if not a.text.endswith('\n')
]
N = len(urls)

N = len(files)

for i, filename in enumerate(files, 1):
out = str(dest.joinpath(filename))
link = urllib.request.urljoin(base, filename)
urllib.request.urlretrieve(link, out)
print(f"Downloaded {link} to {out} [{i}/{N}]")
for i, url in enumerate(urls, 1):
filename = os.path.join("pandas", "dist", url.split("/")[-1])
urllib.request.urlretrieve(url, filename)
print(f"Downloaded {url} to {filename} [{i}/{N}]")


def main(args=None):
Expand Down
2 changes: 1 addition & 1 deletion scripts/pip_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ source activate pip-test

python3 -m pip wheel --no-deps --wheel-dir=/pandas/dist $1
python3 -m pip install --no-deps --no-index --find-links=/pandas/dist --only-binary=pandas pandas
python3 -c "import pandas; pandas.test()"
python3 -c "import pandas; pandas.test(extra_args=['-m not clipboard', '--skip-slow', '--skip-network', '--skip-db'])"
5 changes: 3 additions & 2 deletions scripts/wheels.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,10 @@ git pull upstream
echo `git status`
git checkout -B RLS-"${PANDAS_VERSION}"

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

git add .travis.yml
git add azure
git commit -m "RLS $PANDAS_VERSION"
git --no-pager diff HEAD~1

Expand Down