Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue163 durack1 gfdl demo scripts #164

Merged
merged 19 commits into from
Nov 22, 2014
Merged

Issue163 durack1 gfdl demo scripts #164

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
bcf3d2b
Merge branch 'pcmdi_master'
durack1 Oct 20, 2014
5d419dc
Merge branch 'pcmdi_master'
durack1 Oct 21, 2014
924b37c
fix #122 - rename CMIP_results to data
durack1 Oct 21, 2014
3a19b80
fix #70 - create obs sftlf masks and drop scripts in src_misc subdir
durack1 Oct 21, 2014
6a20747
fix #122 - Corrected upper level dir name from CMIP5 to CMIP
durack1 Oct 21, 2014
03d9066
fix #122 - updated setup.py to deal with new directory structure
durack1 Oct 21, 2014
96cb7fa
fix #122 - updated test_portrait.py to deal with new directory struct…
durack1 Oct 21, 2014
f117633
Merge branch 'issue122_durack1_Rename_CMIP_results_subdir'
durack1 Oct 21, 2014
f0ca1b8
Cleaned up duplicate directories
durack1 Oct 21, 2014
13bb06c
Updating CMIP_metrics_results
durack1 Oct 21, 2014
3e541f6
Merge branch 'issue122_durack1_Rename_CMIP_results_subdir' into issue…
durack1 Oct 21, 2014
a1d10b9
Merge branch 'issue70_durack1_create_obs_sftlf_masks_and_scripts'
durack1 Oct 21, 2014
83dbbde
Merge branch 'pcmdi_master'
durack1 Oct 23, 2014
f100c38
Merge branch 'master' of github.com:durack1/pcmdi_metrics
durack1 Oct 23, 2014
55bbce5
Bringing local up-to-date with remote master
durack1 Oct 23, 2014
e284f3f
Merge branch 'pcmdi_master'
durack1 Nov 3, 2014
befce5f
merge branch pcmdi_master
durack1 Nov 22, 2014
87b888a
fix #163 - adding GFDL demo scripts
durack1 Nov 22, 2014
d7760d0
Cleaned up duplicate files in misc src subdir
durack1 Nov 22, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix #122 - updated setup.py to deal with new directory structure
  • Loading branch information
@durack1
durack1 committed Oct 21, 2014
commit 03d90667bad7be057c89aaebd943d7ec801563ba
58 changes: 29 additions & 29 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
from distutils.core import setup, Extension
import os,sys
import numpy
from distutils.core import setup
Version="0.2.0"
import subprocess
import glob
Expand All @@ -9,41 +7,43 @@
commit = p.stdout.readlines()[0].split()[1]
except:
commit = ""
f=open("src/python/version.py","w")
f = open("src/python/version.py","w")
print >>f, "__version__ = '%s'" % Version
print >>f, "__git_sha1__ = '%s'" % commit
f.close()

portrait_files = ["src/python/graphics/share/portraits.scr",]

cmip5_amip_json = glob.glob("CMIP_results/CMIP5/amip/*.json")
cmip5_historical_json = glob.glob("CMIP_results/CMIP5/historical/*.json")
cmip5_amip_json = glob.glob("data/CMIP_metrics_results/CMIP5/amip/*.json")
cmip5_historical_json = glob.glob("data/CMIP_metrics_results/CMIP5/historical/*.json")
obs_sftlf_nc = glob.glob("data/obs/fx/sftlf/*.nc")


setup (name = "pcmdi_metrics",
version=Version,
author='PCMDI',
description = "model metrics tools",
url = "http:https://github.com/PCMDI/pcmdi_metrics",
packages = ['pcmdi_metrics','pcmdi_metrics.io','pcmdi_metrics.pcmdi','pcmdi_metrics.graphics'],
package_dir = {'pcmdi_metrics': 'src/python',
'pcmdi_metrics.io': 'src/python/io',
'pcmdi_metrics.pcmdi': 'src/python/pcmdi',
'pcmdi_metrics.graphics': 'src/python/graphics',
},
scripts = ["src/python/pcmdi/scripts/pcmdi_metrics_driver.py",
"src/python/pcmdi/scripts/build_obs_meta_dictionary.py"],
setup (name = "pcmdi_metrics",
version = Version,
author ='PCMDI',
description = "model metrics tools",
url = "http:https://github.com/PCMDI/pcmdi_metrics",
packages = ['pcmdi_metrics','pcmdi_metrics.io','pcmdi_metrics.pcmdi','pcmdi_metrics.graphics'],
package_dir = {'pcmdi_metrics': 'src/python',
'pcmdi_metrics.io': 'src/python/io',
'pcmdi_metrics.pcmdi': 'src/python/pcmdi',
'pcmdi_metrics.graphics': 'src/python/graphics',
},
scripts = ["src/python/pcmdi/scripts/pcmdi_metrics_driver.py",
"src/python/pcmdi/scripts/build_obs_meta_dictionary.py"],

data_files = [('share/pcmdi',('doc/obs_info_dictionary.json',)),
('share/CMIP_results/CMIP5/amip',cmip5_amip_json),
('share/CMIP_results/CMIP5/historical',cmip5_historical_json),
('share/graphics/vcs',portrait_files),
('doc',('doc/parameter_files/pcmdi_input_parameters_sample.py',)),
('test/graphics',("test/graphics/test_portrait.py",)),
('test/pcmdi',('test/pcmdi/basic_test_parameters_file.py','test/pcmdi/tos_GFDL-ESM2G_Omon_historical_r1i1p1_198501-200512-clim.nc','test/pcmdi/sftlf_GFDL-ESM2G.nc','test/pcmdi/tos_2.5x2.5_esmf_linear_metrics.json')),
('test/pcmdi/obs/ocn/mo/tos/UKMETOFFICE-HadISST-v1-1/ac',('test/pcmdi/tos_pcmdi-metrics_Omon_UKMETOFFICE-HadISST-v1-1_198002-200501-clim.nc',)),
('test/pcmdi/obs/fx/mo/sftlf/UKMETOFFICE-HadISST-v1-1/ac',('test/pcmdi/sftlf_pcmdi-metrics_fx_UKMETOFFICE-HadISST-v1-1_198002-200501-clim.nc',)),
]
data_files = [('share/pcmdi',('doc/obs_info_dictionary.json',)),
('share/CMIP_metrics_results/CMIP5/amip',cmip5_amip_json),
('share/CMIP_metrics_results/CMIP5/historical',cmip5_historical_json),
('share/obs/fx/sftlf',obs_sftlf_nc),
('share/graphics/vcs',portrait_files),
('doc',('doc/parameter_files/pcmdi_input_parameters_sample.py',)),
('test/graphics',("test/graphics/test_portrait.py",)),
('test/pcmdi',('test/pcmdi/basic_test_parameters_file.py','test/pcmdi/tos_GFDL-ESM2G_Omon_historical_r1i1p1_198501-200512-clim.nc','test/pcmdi/sftlf_GFDL-ESM2G.nc','test/pcmdi/tos_2.5x2.5_esmf_linear_metrics.json')),
('test/pcmdi/obs/ocn/mo/tos/UKMETOFFICE-HadISST-v1-1/ac',('test/pcmdi/tos_pcmdi-metrics_Omon_UKMETOFFICE-HadISST-v1-1_198002-200501-clim.nc',)),
('test/pcmdi/obs/fx/mo/sftlf/UKMETOFFICE-HadISST-v1-1/ac',('test/pcmdi/sftlf_pcmdi-metrics_fx_UKMETOFFICE-HadISST-v1-1_198002-200501-clim.nc',)),
]
#include_dirs = [numpy.lib.utils.get_include()],
# ext_modules = [
# Extension('pcmdi_metrics.exts',
Expand Down