Skip to content

Commit

Permalink
(1) Exclude cmec and tests directories from package finding, to address
Browse files Browse the repository at this point in the history
#858. (2) Remove not-in-use files (old demo, png, vcs-related). (3) Clean up
  • Loading branch information
lee1043 committed Oct 19, 2022
1 parent 0261afc commit 8c0d3f4
Showing 1 changed file with 1 addition and 23 deletions.
24 changes: 1 addition & 23 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,21 +48,8 @@
p = subprocess.Popen(["python", "setup_default_args.py"], cwd="share")
p.communicate()

portrait_files = [
"pcmdi_metrics/graphics/share/portraits.scr",
]
packages = find_packages(exclude=['cmec', 'tests'])

packages = {
"pcmdi_metrics": "src/python",
"pcmdi_metrics.io": "src/python/io",
"pcmdi_metrics.pcmdi": "src/python/pcmdi",
"pcmdi_metrics.diurnal": "src/python/diurnal",
"pcmdi_metrics.graphics": "src/python/graphics",
"pcmdi_metrics.driver": "src/python/pcmdi/scripts/driver",
"pcmdi_metrics.monsoon_wang": "src/python/monsoon_wang/lib",
"pcmdi_metrics.monsoon_sperber": "src/python/monsoon_sperber/lib",
}
packages = find_packages()
scripts = [
"pcmdi_metrics/pcmdi/scripts/mean_climate_driver.py",
"pcmdi_metrics/pcmdi/scripts/pcmdi_compute_climatologies.py",
Expand All @@ -76,7 +63,6 @@
"pcmdi_metrics/precip_variability/variability_across_timescales_PS_driver.py",
"pcmdi_metrics/precip_distribution/precip_distribution_driver.py",
]
# scripts += glob.glob("pcmdi_metrics/diurnal/scripts/*.py")

entry_points = {
"console_scripts": [
Expand All @@ -91,15 +77,10 @@
],
}

demo_files = glob.glob("demo/*/*")
print("demo files")

data_files = (
("share/pmp/graphics/vcs", portrait_files),
(
"share/pmp/graphics/png",
[
"share/pcmdi/171101_doutriaux1_UVCDATLogo_446x119px_72dpi.png",
"share/pcmdi/CDATLogo_140x49px_72dpi.png",
"share/pcmdi/CDATLogo_1866x651px_300dpi.png",
"share/pcmdi/CDATLogo_200x70px_72dpi.png",
Expand All @@ -111,8 +92,6 @@
"share/pcmdi/PCMDILogo_400x131px_72dpi.png",
"share/pcmdi/PCMDILogo_500x164px_72dpi.png",
"share/pcmdi/PCMDILogoText_1365x520px_300dpi.png",
"share/pcmdi/PCMDILogo-old-oblong_377x300px_72dpi.png",
"share/pcmdi/PCMDILogo-old_348x300px_72dpi.png",
"share/pcmdi/PMPLogoText_1359x1146px_300dpi.png",
"share/pcmdi/PMPLogo_1359x1146px_300dpi.png",
"share/pcmdi/PMPLogo_500x421px_72dpi.png",
Expand All @@ -131,7 +110,6 @@
"pcmdi_metrics/precip_distribution/lib/cluster3_pdf.amt_regrid.360x180_IMERG_ALL.nc",
),
),
("share/pmp/demo", demo_files),
)

if install_dev:
Expand Down

0 comments on commit 8c0d3f4

Please sign in to comment.