Fix numpy deprecation of np.float in issubdtype numpy/numpy#9505

openfisca · Jan 30, 2018 · 2e7701d · 2e7701d
1 parent 0ab0a29
commit 2e7701d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 
 # Changelog
 
+## 0.9.4
+* Numpy deprcates use of np.float with issubdtype
+
 ## 0.9.3
 * Fix difference pivot_table computation
 * CLarify code (use variable instead of column) and add some doctring

diff --git a/openfisca_survey_manager/scenarios.py b/openfisca_survey_manager/scenarios.py
@@ -665,7 +665,7 @@ def init_simulation_with_data_frame(self, input_data_frame = None, period = None
                     'Converting {} from dtype {} to {}'.format(
                         column_name, column_serie.values.dtype, holder.variable.dtype)
                     )
-            if np.issubdtype(column_serie.values.dtype, np.float):
+            if np.issubdtype(column_serie.values.dtype, np.floating):
                 if column_serie.isnull().any():
                     log.debug('There are {} NaN values for {} non NaN values in variable {}'.format(
                         column_serie.isnull().sum(), column_serie.notnull().sum(), column_name))
@@ -923,7 +923,7 @@ def init_simulation_with_data_frame_by_entity(input_data_frame_by_entity = None,
                     'Converting {} from dtype {} to {}'.format(
                         column_name, column_serie.values.dtype, holder.variable.dtype)
                     )
-            if np.issubdtype(column_serie.values.dtype, np.float):
+            if np.issubdtype(column_serie.values.dtype, np.floating):
                 assert column_serie.notnull().all(), 'There are {} NaN values in variable {}'.format(
                     column_serie.isnull().sum(), column_name)
 

diff --git a/setup.py b/setup.py
@@ -24,7 +24,7 @@
 
 setup(
     name = 'OpenFisca-Survey-Manager',
-    version = '0.9.3',
+    version = '0.9.4',
     author = 'OpenFisca Team',
     author_email = '[email protected]',
     classifiers = [classifier for classifier in classifiers.split('\n') if classifier],
@@ -52,7 +52,7 @@
     install_requires = [
         'configparser',
         'humanize',
-        'numpy',
+        'numpy >= 1.12',
         'openfisca-core >= 20.0.0, < 21.0.0 ',
         'pandas >= 0.20',
         'PyYAML',