Skip to content

Commit 779b6f0

Browse files
Merge branch 'master' into bug_delta_time
2 parents 9577408 + 5b88d2f commit 779b6f0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+779
-396
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
- [ ] closes #xxxx
22
- [ ] tests added / passed
3-
- [ ] passes ``git diff upstream/master --name-only -- '*.py' | flake8 --diff``
3+
- [ ] passes ``git diff upstream/master --name-only -- '*.py' | flake8 --diff`` (On Windows, ``git diff upstream/master -u -- "*.py" | flake8 --diff`` might work as an alternative.)
44
- [ ] whatsnew entry

asv_bench/benchmarks/hdfstore_bench.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,15 @@ def time_query_store_table(self):
9090
stop = self.df2.index[15000]
9191
self.store.select('table', where="index > start and index < stop")
9292

93+
def time_store_repr(self):
94+
repr(self.store)
95+
96+
def time_store_str(self):
97+
str(self.store)
98+
99+
def time_store_info(self):
100+
self.store.info()
101+
93102

94103
class HDF5Panel(object):
95104
goal_time = 0.2

ci/requirements-2.7.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ python=2.7*
22
python-dateutil=2.4.1
33
pytz=2013b
44
nomkl
5-
numpy=1.12*
5+
numpy
66
cython=0.23

ci/requirements-2.7.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ source activate pandas
44

55
echo "install 27"
66

7-
conda install -n pandas -c conda-forge feather-format
7+
conda install -n pandas -c conda-forge feather-format jemalloc=4.4.0

ci/requirements-2.7_BUILD_TEST.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ source activate pandas
44

55
echo "install 27 BUILD_TEST"
66

7-
conda install -n pandas -c conda-forge pyarrow dask
7+
conda install -n pandas -c conda-forge pyarrow dask jemalloc=4.4.0

ci/requirements-3.5.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ source activate pandas
44

55
echo "install 35"
66

7-
conda install -n pandas -c conda-forge feather-format
7+
conda install -n pandas -c conda-forge feather-format jemalloc=4.4.0

ci/requirements-3.6.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ python=3.6*
22
python-dateutil
33
pytz
44
nomkl
5-
numpy=1.12*
5+
numpy
66
cython

ci/requirements-3.6.run

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ html5lib
1414
jinja2
1515
sqlalchemy
1616
pymysql
17+
jemalloc=4.4.0
1718
feather-format
1819
# psycopg2 (not avail on defaults ATM)
1920
beautifulsoup4

ci/requirements-3.6_DOC.run

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ipython
22
ipykernel
33
ipywidgets
4-
sphinx
4+
sphinx=1.5*
55
nbconvert
66
nbformat
77
notebook

ci/requirements-3.6_DOC.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ echo "[install DOC_BUILD deps]"
66

77
pip install pandas-gbq
88

9-
conda install -n pandas -c conda-forge feather-format nbsphinx pandoc
9+
conda install -n pandas -c conda-forge feather-format nbsphinx pandoc jemalloc=4.4.0
1010

1111
conda install -n pandas -c r r rpy2 --yes

0 commit comments

Comments
 (0)