From 8fa15299dca1400f715e92add9d35d904882fbb4 Mon Sep 17 00:00:00 2001 From: Emanuel Schmid <51439563+emanuel-schmid@users.noreply.github.com> Date: Mon, 21 Aug 2023 14:19:02 +0200 Subject: [PATCH] Move demo data into package directory (#90) * data: move all files required for climada_petals package to climada_petals/data * adapt setup.py * include FR_DE_DEMO file in package --- climada_petals/__init__.py | 16 ++++++++++----- .../FAOSTAT_data_producer_prices.csv | 0 .../FAOSTAT_data_production_quantity.csv | 0 ...oduction_demo_data_cultivated_area_CHE.nc4 | Bin .../crop_production_demo_data_yields_CHE.nc4 | Bin .../hist_mean_mai-firr_1976-2005_DE_FR.hdf5 | Bin ...use-15crops_annual_FR_DE_DEMO_2001_2005.nc | Bin .../GDP2Asset_converter_2.5arcmin.nc | Bin .../data/gdp_asset}/gdp2asset_CHE_exposure.nc | Bin ...rr_global_DEMO_TJANJIN_annual_1861_2005.nc | Bin ...d-whe-noirr_annual_FR_DE_DEMO_1861_2005.nc | Bin ...rr_global_annual_DEMO_TJANJIN_1861_2005.nc | Bin ...rr_global_annual_DEMO_TJANJIN_1861_2005.nc | Bin .../data/river_flood}/flddph_2000_DEMO.nc | Bin .../data/river_flood}/fldfrc_2000_DEMO.nc | Bin .../Portugal_firms_2016_17_18_MODIS.csv | 0 .../wildfire}/Portugal_firms_June_2017.csv | 0 setup.py | 19 ++++++------------ 18 files changed, 17 insertions(+), 18 deletions(-) rename {data/demo => climada_petals/data/crop_production}/FAOSTAT_data_producer_prices.csv (100%) rename {data/demo => climada_petals/data/crop_production}/FAOSTAT_data_production_quantity.csv (100%) rename {data/demo => climada_petals/data/crop_production}/crop_production_demo_data_cultivated_area_CHE.nc4 (100%) rename {data/demo => climada_petals/data/crop_production}/crop_production_demo_data_yields_CHE.nc4 (100%) rename {data/demo => climada_petals/data/crop_production}/hist_mean_mai-firr_1976-2005_DE_FR.hdf5 (100%) rename {data/demo => climada_petals/data/crop_production}/histsoc_landuse-15crops_annual_FR_DE_DEMO_2001_2005.nc (100%) rename {data/system => climada_petals/data/gdp_asset}/GDP2Asset_converter_2.5arcmin.nc (100%) rename {data/demo => climada_petals/data/gdp_asset}/gdp2asset_CHE_exposure.nc (100%) rename {data/demo => climada_petals/data/relative_cropyield}/gepic_gfdl-esm2m_ewembi_historical_2005soc_co2_yield-whe-noirr_global_DEMO_TJANJIN_annual_1861_2005.nc (100%) rename {data/demo => climada_petals/data/relative_cropyield}/lpjml_ipsl-cm5a-lr_ewembi_historical_2005soc_co2_yield-whe-noirr_annual_FR_DE_DEMO_1861_2005.nc (100%) rename {data/demo => climada_petals/data/relative_cropyield}/pepic_miroc5_ewembi_historical_2005soc_co2_yield-whe-firr_global_annual_DEMO_TJANJIN_1861_2005.nc (100%) rename {data/demo => climada_petals/data/relative_cropyield}/pepic_miroc5_ewembi_historical_2005soc_co2_yield-whe-noirr_global_annual_DEMO_TJANJIN_1861_2005.nc (100%) rename {data/demo => climada_petals/data/river_flood}/flddph_2000_DEMO.nc (100%) rename {data/demo => climada_petals/data/river_flood}/fldfrc_2000_DEMO.nc (100%) rename {data/demo => climada_petals/data/wildfire}/Portugal_firms_2016_17_18_MODIS.csv (100%) rename {data/demo => climada_petals/data/wildfire}/Portugal_firms_June_2017.csv (100%) diff --git a/climada_petals/__init__.py b/climada_petals/__init__.py index 95fd5e53d..74ce6017a 100644 --- a/climada_petals/__init__.py +++ b/climada_petals/__init__.py @@ -26,23 +26,29 @@ from .util.constants import * REPO_DATA = { - 'data/system': [ + 'climada_petals/data/gdp_asset': [ SYSTEM_DIR.joinpath('GDP2Asset_converter_2.5arcmin.nc'), + DEMO_GDP2ASSET, ], - 'data/demo': [ + 'climada_petals/data/river_flood': [ HAZ_DEMO_FLDDPH, HAZ_DEMO_FLDFRC, - DEMO_GDP2ASSET, + ], + 'climada_petals/data/crop_production': [ DEMO_DIR.joinpath('crop_production_demo_data_yields_CHE.nc4'), DEMO_DIR.joinpath('crop_production_demo_data_cultivated_area_CHE.nc4'), DEMO_DIR.joinpath('FAOSTAT_data_producer_prices.csv'), DEMO_DIR.joinpath('FAOSTAT_data_production_quantity.csv'), - DEMO_DIR.joinpath('gepic_gfdl-esm2m_ewembi_historical_2005soc_co2_yield-whe-noirr_global_DEMO_TJANJIN_annual_1861_2005.nc'), DEMO_DIR.joinpath('hist_mean_mai-firr_1976-2005_DE_FR.hdf5'), DEMO_DIR.joinpath('histsoc_landuse-15crops_annual_FR_DE_DEMO_2001_2005.nc'), - DEMO_DIR.joinpath('lpjml_ipsl-cm5a-lr_ewembi_historical_2005soc_co2_yield-whe-noirr_annual_FR_DE_DEMO_1861_2005.nc'), + ], + 'climada_petals/data/relative_cropyield': [ + DEMO_DIR.joinpath('gepic_gfdl-esm2m_ewembi_historical_2005soc_co2_yield-whe-noirr_global_DEMO_TJANJIN_annual_1861_2005.nc'), DEMO_DIR.joinpath('pepic_miroc5_ewembi_historical_2005soc_co2_yield-whe-firr_global_annual_DEMO_TJANJIN_1861_2005.nc'), DEMO_DIR.joinpath('pepic_miroc5_ewembi_historical_2005soc_co2_yield-whe-noirr_global_annual_DEMO_TJANJIN_1861_2005.nc'), + DEMO_DIR.joinpath('lpjml_ipsl-cm5a-lr_ewembi_historical_2005soc_co2_yield-whe-noirr_annual_FR_DE_DEMO_1861_2005.nc'), + ], + 'climada_petals/data/wildfire': [ DEMO_DIR.joinpath('Portugal_firms_June_2017.csv'), DEMO_DIR.joinpath('Portugal_firms_2016_17_18_MODIS.csv'), ] diff --git a/data/demo/FAOSTAT_data_producer_prices.csv b/climada_petals/data/crop_production/FAOSTAT_data_producer_prices.csv similarity index 100% rename from data/demo/FAOSTAT_data_producer_prices.csv rename to climada_petals/data/crop_production/FAOSTAT_data_producer_prices.csv diff --git a/data/demo/FAOSTAT_data_production_quantity.csv b/climada_petals/data/crop_production/FAOSTAT_data_production_quantity.csv similarity index 100% rename from data/demo/FAOSTAT_data_production_quantity.csv rename to climada_petals/data/crop_production/FAOSTAT_data_production_quantity.csv diff --git a/data/demo/crop_production_demo_data_cultivated_area_CHE.nc4 b/climada_petals/data/crop_production/crop_production_demo_data_cultivated_area_CHE.nc4 similarity index 100% rename from data/demo/crop_production_demo_data_cultivated_area_CHE.nc4 rename to climada_petals/data/crop_production/crop_production_demo_data_cultivated_area_CHE.nc4 diff --git a/data/demo/crop_production_demo_data_yields_CHE.nc4 b/climada_petals/data/crop_production/crop_production_demo_data_yields_CHE.nc4 similarity index 100% rename from data/demo/crop_production_demo_data_yields_CHE.nc4 rename to climada_petals/data/crop_production/crop_production_demo_data_yields_CHE.nc4 diff --git a/data/demo/hist_mean_mai-firr_1976-2005_DE_FR.hdf5 b/climada_petals/data/crop_production/hist_mean_mai-firr_1976-2005_DE_FR.hdf5 similarity index 100% rename from data/demo/hist_mean_mai-firr_1976-2005_DE_FR.hdf5 rename to climada_petals/data/crop_production/hist_mean_mai-firr_1976-2005_DE_FR.hdf5 diff --git a/data/demo/histsoc_landuse-15crops_annual_FR_DE_DEMO_2001_2005.nc b/climada_petals/data/crop_production/histsoc_landuse-15crops_annual_FR_DE_DEMO_2001_2005.nc similarity index 100% rename from data/demo/histsoc_landuse-15crops_annual_FR_DE_DEMO_2001_2005.nc rename to climada_petals/data/crop_production/histsoc_landuse-15crops_annual_FR_DE_DEMO_2001_2005.nc diff --git a/data/system/GDP2Asset_converter_2.5arcmin.nc b/climada_petals/data/gdp_asset/GDP2Asset_converter_2.5arcmin.nc similarity index 100% rename from data/system/GDP2Asset_converter_2.5arcmin.nc rename to climada_petals/data/gdp_asset/GDP2Asset_converter_2.5arcmin.nc diff --git a/data/demo/gdp2asset_CHE_exposure.nc b/climada_petals/data/gdp_asset/gdp2asset_CHE_exposure.nc similarity index 100% rename from data/demo/gdp2asset_CHE_exposure.nc rename to climada_petals/data/gdp_asset/gdp2asset_CHE_exposure.nc diff --git a/data/demo/gepic_gfdl-esm2m_ewembi_historical_2005soc_co2_yield-whe-noirr_global_DEMO_TJANJIN_annual_1861_2005.nc b/climada_petals/data/relative_cropyield/gepic_gfdl-esm2m_ewembi_historical_2005soc_co2_yield-whe-noirr_global_DEMO_TJANJIN_annual_1861_2005.nc similarity index 100% rename from data/demo/gepic_gfdl-esm2m_ewembi_historical_2005soc_co2_yield-whe-noirr_global_DEMO_TJANJIN_annual_1861_2005.nc rename to climada_petals/data/relative_cropyield/gepic_gfdl-esm2m_ewembi_historical_2005soc_co2_yield-whe-noirr_global_DEMO_TJANJIN_annual_1861_2005.nc diff --git a/data/demo/lpjml_ipsl-cm5a-lr_ewembi_historical_2005soc_co2_yield-whe-noirr_annual_FR_DE_DEMO_1861_2005.nc b/climada_petals/data/relative_cropyield/lpjml_ipsl-cm5a-lr_ewembi_historical_2005soc_co2_yield-whe-noirr_annual_FR_DE_DEMO_1861_2005.nc similarity index 100% rename from data/demo/lpjml_ipsl-cm5a-lr_ewembi_historical_2005soc_co2_yield-whe-noirr_annual_FR_DE_DEMO_1861_2005.nc rename to climada_petals/data/relative_cropyield/lpjml_ipsl-cm5a-lr_ewembi_historical_2005soc_co2_yield-whe-noirr_annual_FR_DE_DEMO_1861_2005.nc diff --git a/data/demo/pepic_miroc5_ewembi_historical_2005soc_co2_yield-whe-firr_global_annual_DEMO_TJANJIN_1861_2005.nc b/climada_petals/data/relative_cropyield/pepic_miroc5_ewembi_historical_2005soc_co2_yield-whe-firr_global_annual_DEMO_TJANJIN_1861_2005.nc similarity index 100% rename from data/demo/pepic_miroc5_ewembi_historical_2005soc_co2_yield-whe-firr_global_annual_DEMO_TJANJIN_1861_2005.nc rename to climada_petals/data/relative_cropyield/pepic_miroc5_ewembi_historical_2005soc_co2_yield-whe-firr_global_annual_DEMO_TJANJIN_1861_2005.nc diff --git a/data/demo/pepic_miroc5_ewembi_historical_2005soc_co2_yield-whe-noirr_global_annual_DEMO_TJANJIN_1861_2005.nc b/climada_petals/data/relative_cropyield/pepic_miroc5_ewembi_historical_2005soc_co2_yield-whe-noirr_global_annual_DEMO_TJANJIN_1861_2005.nc similarity index 100% rename from data/demo/pepic_miroc5_ewembi_historical_2005soc_co2_yield-whe-noirr_global_annual_DEMO_TJANJIN_1861_2005.nc rename to climada_petals/data/relative_cropyield/pepic_miroc5_ewembi_historical_2005soc_co2_yield-whe-noirr_global_annual_DEMO_TJANJIN_1861_2005.nc diff --git a/data/demo/flddph_2000_DEMO.nc b/climada_petals/data/river_flood/flddph_2000_DEMO.nc similarity index 100% rename from data/demo/flddph_2000_DEMO.nc rename to climada_petals/data/river_flood/flddph_2000_DEMO.nc diff --git a/data/demo/fldfrc_2000_DEMO.nc b/climada_petals/data/river_flood/fldfrc_2000_DEMO.nc similarity index 100% rename from data/demo/fldfrc_2000_DEMO.nc rename to climada_petals/data/river_flood/fldfrc_2000_DEMO.nc diff --git a/data/demo/Portugal_firms_2016_17_18_MODIS.csv b/climada_petals/data/wildfire/Portugal_firms_2016_17_18_MODIS.csv similarity index 100% rename from data/demo/Portugal_firms_2016_17_18_MODIS.csv rename to climada_petals/data/wildfire/Portugal_firms_2016_17_18_MODIS.csv diff --git a/data/demo/Portugal_firms_June_2017.csv b/climada_petals/data/wildfire/Portugal_firms_June_2017.csv similarity index 100% rename from data/demo/Portugal_firms_June_2017.csv rename to climada_petals/data/wildfire/Portugal_firms_June_2017.csv diff --git a/setup.py b/setup.py index 5bdd87aa3..a1e55478e 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ """ from pathlib import Path -from setuptools import setup, find_packages +from setuptools import setup, find_namespace_packages here = Path(__file__).parent.absolute() @@ -10,29 +10,23 @@ with open(here / 'doc/misc/README.md', encoding='utf-8') as f: long_description = f.read() -# Add configuration files -extra_files = [str(here / 'climada_petals/conf/climada.conf'), str(here / 'doc/misc/README.md')] - setup( name='climada_petals', version='3.3.0', - description='CLIMADA in Python', + description='CLIMADA Extensions in Python', long_description=long_description, long_description_content_type='text/markdown', - url='https://github.com/davidnbresch/climada_python', + url='https://github.com/CLIMADA-project/climada_python', author='ETH', license='OSI Approved :: GNU General Public License v3 (GPLv3)', classifiers=[ - # 3 - Alpha - # 4 - Beta - # 5 - Production/Stable 'Development Status :: 4 - Beta', 'Programming Language :: Python :: 3.9', 'Topic :: Scientific/Engineering :: Atmospheric Science', @@ -42,14 +36,13 @@ keywords='climate adaptation', - packages=find_packages(where='.'), - install_requires=[ 'climada', 'scikit-image', ], - package_data={'': extra_files}, + packages=find_namespace_packages(include=['climada_petals*']), - include_package_data=True + setup_requires=['setuptools_scm'], + include_package_data=True, )