diff --git a/JAT/Jarkus_Analysis_Toolbox.py b/JAT/Jarkus_Analysis_Toolbox.py index c33884b..c0a7270 100644 --- a/JAT/Jarkus_Analysis_Toolbox.py +++ b/JAT/Jarkus_Analysis_Toolbox.py @@ -565,12 +565,12 @@ def normalize_dimensions(self): # Retrieve normalization type that should be applied from the configuration file norm_type = self.config['user defined']['normalization']['type'] if norm_type == 'mean': - for i, col in dimensions.iteritems(): + for i, col in dimensions.items(): # Get the mean cross-shore location per transect and subtract that from the values of the variable for each transect normalized.loc[:, i] = col - col.mean() elif norm_type == 'norm_year': norm_year = self.config['user defined']['normalization'][' year'] - for i, col in dimensions.iteritems(): + for i, col in dimensions.items(): # Get norm value for the cross-shore location in the norm year and subtract that from the values of the variable for each transect normalized.loc[:, i] = col - col[norm_year] diff --git a/setup.py b/setup.py index 0974db1..dfedb31 100644 --- a/setup.py +++ b/setup.py @@ -14,16 +14,12 @@ url="https://github.com/christavanijzendoorn/JAT.git", packages=setuptools.find_packages(), install_requires=[ - 'numpy==1.17.2', - 'pandas==0.25.1', - 'netCDF4==1.4.1', - 'scipy==1.3.1', + 'numpy', + 'pandas', + 'netCDF4', + 'scipy', 'matplotlib', - 'cftime==1.0.3.4', - 'joblib==0.13.2', - 'pybeach', - 'pyyaml==5.2', - 'Pillow'], + 'pyyaml',], classifiers=[ "Programming Language :: Python :: 3", "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",