Fix pip install datadotworld[pandas] (#47)

datadotworld · Jun 2, 2017 · d86c667 · d86c667
1 parent 3836077
commit d86c667
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 8 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -43,6 +43,6 @@ jobs:
           name: Release to pypi
           command: |
             if [[ "${CIRCLE_BRANCH}" =~ ^(${RELEASE_BRANCH})$ ]]; then
-              python setup.py sdist --formats=gztar
+              python setup.py sdist bdist_wheel
               twine upload -u $PYPI_USERNAME -p $PYPI_PASSWORD dist/*
             fi
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1 +1 @@
-include *.md
+include README.rst LICENSE.txt
diff --git a/README.rst b/README.rst
@@ -21,7 +21,7 @@ You can install it using ``pip`` directly from PyPI::
 
 Optionally, you can install the library including pandas support::
 
-    pip install datadotworld[PANDAS]
+    pip install datadotworld[pandas]
 
 Configure
 ---------

diff --git a/datadotworld/__init__.py b/datadotworld/__init__.py
@@ -30,7 +30,7 @@
 from datadotworld.config import FileConfig, ChainedConfig
 from datadotworld.datadotworld import DataDotWorld
 
-__version__ = '1.2.1'
+__version__ = '1.2.2'
 
 # Convenience top-level functions
 

diff --git a/datadotworld/models/dataset.py b/datadotworld/models/dataset.py
@@ -171,7 +171,7 @@ def _load_dataframe(self, resource_name):
             import pandas
         except ImportError:
             raise RuntimeError('To enable dataframe support, '
-                               'run \'pip install datadotworld[PANDAS]\'')
+                               'run \'pip install datadotworld[pandas]\'')
 
         tabular_resource = self.__tabular_resources[resource_name]
         field_dtypes = fields_to_dtypes(tabular_resource.descriptor['schema'])

diff --git a/datadotworld/models/query.py b/datadotworld/models/query.py
@@ -101,6 +101,6 @@ def dataframe(self):
             import pandas as pd
         except ImportError:
             raise RuntimeError('To enable dataframe support, '
-                               'run \'pip install datadotworld[PANDAS]\'')
+                               'run \'pip install datadotworld[pandas]\'')
 
         return pd.DataFrame.from_records(self.table, coerce_float=True)
diff --git a/setup.cfg b/setup.cfg
@@ -2,4 +2,10 @@
 test=pytest
 
 [bdist_wheel]
-universal=1
+universal=1
+
+[metadata]
+provides-extra =
+    pandas
+requires-dist =
+    pandas<1.0a; extra == 'pandas'
diff --git a/setup.py b/setup.py
@@ -90,7 +90,7 @@ def find_version(*paths):
         'pandas<1.0a',
     ],
     extras_require={
-        'PANDAS': [
+        'pandas': [
             'pandas<1.0a',
         ],
     },