From e8a0fbb9f37008f0a624a27088fcb5fc27a90acb Mon Sep 17 00:00:00 2001
From: stevedodson <stevedodson@users.noreply.github.com>
Date: Tue, 10 Dec 2019 16:05:37 +0100
Subject: [PATCH] Feature/pandas.0.25.3 (#91)

* Added example notebooks + pytest for these notebooks1

* Fixed paths

* Fixing link in docs

* Minor update for pandas 0.25.3

* Updates for pandas 0.25.3

* Fixing doc links with pandas 0.25.3 update.

* Reverting overwrite to changes to notebooks.
---
 docs/requirements-docs.txt | 4 ++--
 docs/source/conf.py        | 2 +-
 eland/dataframe.py         | 8 ++++----
 eland/utils.py             | 2 +-
 requirements-dev.txt       | 4 ++--
 requirements.txt           | 2 +-
 setup.py                   | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt
index 61f1395..8ad6cd0 100644
--- a/docs/requirements-docs.txt
+++ b/docs/requirements-docs.txt
@@ -1,7 +1,7 @@
 elasticsearch>=7.0.5
-pandas==0.25.1
+pandas==0.25.3
 matplotlib
 pytest>=5.2.1
 git+https://github.com/pandas-dev/pandas-sphinx-theme.git@master
-numpydoc==0.8
+numpydoc>=0.9.0
 nbsphinx
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 5897d58..f70158d 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -70,7 +70,7 @@ except ImportError:
 '''
 
 extlinks = {
-    'pandas_api_docs': ('https://pandas.pydata.org/pandas-docs/version/0.25.1/reference/api/%s.html', ''),
+    'pandas_api_docs': ('https://pandas.pydata.org/pandas-docs/stable/reference/api/%s.html', ''),
     'pandas_user_guide': ('https://pandas.pydata.org/pandas-docs/stable/user_guide/%s.html', 'Pandas User Guide/'),
     'es_api_docs': ('https://www.elastic.co/guide/en/elasticsearch/reference/current/%s.html', '')
 }
diff --git a/eland/dataframe.py b/eland/dataframe.py
index 0e5533c..3229056 100644
--- a/eland/dataframe.py
+++ b/eland/dataframe.py
@@ -312,7 +312,7 @@ class DataFrame(NDFrame):
                 max_rows = min_rows
 
             return self.to_html(max_rows=max_rows, max_cols=max_cols,
-                                show_dimensions=show_dimensions, notebook=True)
+                                show_dimensions=show_dimensions, notebook=True)  # set for consistency with pandas output
         else:
             return None
 
@@ -590,7 +590,7 @@ class DataFrame(NDFrame):
 
         See Also
         --------
-        :pandas_api_docs:`pandas.DataFrame.to_html` for argument details.
+        :pandas_api_docs:`pandas.DataFrame.to_html`
         """
         # In pandas calling 'to_string' without max_rows set, will dump ALL rows - we avoid this
         # by limiting rows by default.
@@ -655,7 +655,7 @@ class DataFrame(NDFrame):
 
         See Also
         --------
-        :pandas_api_docs:`pandas.DataFrame.to_string` for argument details.
+        :pandas_api_docs:`pandas.DataFrame.to_string`
         """
         # In pandas calling 'to_string' without max_rows set, will dump ALL rows - we avoid this
         # by limiting rows by default.
@@ -826,7 +826,7 @@ class DataFrame(NDFrame):
 
         See Also
         --------
-        :pandas_api_docs:`pandas.DataFrame.to_csv` for argument details.
+        :pandas_api_docs:`pandas.DataFrame.to_csv`
         """
         kwargs = {
             "path_or_buf": path_or_buf,
diff --git a/eland/utils.py b/eland/utils.py
index 1b7fe8c..1d3bde0 100644
--- a/eland/utils.py
+++ b/eland/utils.py
@@ -271,7 +271,7 @@ def read_csv(filepath_or_buffer,
 
     See Also
     --------
-    :pandas_api_docs:`pandas.read_csv` - for all parameters
+    :pandas_api_docs:`pandas.read_csv`
 
     Notes
     -----
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 4dd97d4..15329ee 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,6 +1,6 @@
 elasticsearch>=7.0.5
-pandas==0.25.1
+pandas==0.25.3
 matplotlib
 pytest>=5.2.1
 nbval
-numpydoc==0.8
+numpydoc>=0.9.0
diff --git a/requirements.txt b/requirements.txt
index ae93c72..b291345 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,3 @@
 elasticsearch>=7.0.5
-pandas==0.25.1
+pandas==0.25.3
 matplotlib
diff --git a/setup.py b/setup.py
index 86daed1..dd5b044 100644
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@ setup(
     packages=['eland'],
     install_requires=[
         'elasticsearch>=7.0.5',
-        'pandas==0.25.1',
+        'pandas==0.25.3',
         'matplotlib'
     ]
 )