Changeset 449


Ignore:
Timestamp:
26/10/15 08:45:10 (4 years ago)
Author:
mjuckes
Message:

add dreqML project

Files:
4 added
6 edited

Legend:

Unmodified
Added
Removed
  • CMIP6dreq/manage/step1.py

    r422 r449  
    55----- 
    66 
    7 python step1.py <version> "<comment on version>"  ## updates versionConfig.py and creates "step2.sh" 
     7python step1.py "<comment on version>"  ## updates versionConfig.py and creates "step2.sh" 
     8           Uses version specified in trunk 
    89bash step2.sh    ## checks trunk into repository, creates tagged version 
    910""" 
    1011 
    11 import sys, os, glob, string 
     12import sys, os, glob, string, time 
    1213if os.path.isfile( 'step2.sh' ): 
    1314  os.unlink( 'step2.sh' ) 
     15 
     16d1 = os.getcwd() 
     17print d1 
     18sys.path.append('../trunk/dreqPy' ) 
     19##os.chdir( '../trunk/dreqPy' ) 
     20##print os.getcwd() 
     21##time.sleep(1) 
     22##import packageConfig 
     23import __init__ 
     24version = __init__.__version__ 
     25##os.chdir( d1 ) 
    1426 
    1527svnBaseUrl = 'http://proj.badc.rl.ac.uk/svn/exarch/CMIP6dreq' 
     
    1830tags = glob.glob( '../tags/*' ) 
    1931 
    20 f1 = lambda x: map( int, string.split(x, '.' ) ) 
     32##f1 = lambda x: map( int, string.split(x, '.' ) ) 
    2133def f1( vs ): 
    2234  if vs == 'latest': 
     
    5264      return cmp( t1[0], t2[0] ) 
    5365     
    54 thistag, thiscomment = sys.argv[1:] 
    55 thistn = tuple( f1( thistag ) ) 
     66##thistag, thiscomment = sys.argv[1:] 
     67thiscomment = sys.argv[1] 
     68thistag = version 
     69thistn = tuple( f1( version ) ) 
    5670if len(tags) > 0: 
    5771  tn = map( lambda x: tuple( f1(string.split(x,'/')[-1]) ),  tags ) 
  • CMIP6dreq/tags/01.beta.09/dreqPy/__init__.py

    r432 r449  
    1010 
    1111__versionComment__ = "Support for command line interface added" 
    12 __version__ = "01.beta.09" 
     12__version__ = "01.beta.10" 
    1313__title__ = "dreqPy" 
    1414__description__ = "CMIP6 Data Request Python API" 
  • CMIP6dreq/tags/01.beta.09/setup.py

    r438 r449  
    9191        install_requires=INSTALL_REQUIRES, 
    9292        data_files = [("", ["LICENSE"])], 
     93        include_package_data=True, 
    9394        entry_points= { 
    94         'console_scripts': ['drq = dreqPy.dreqCmdl:main_entry'], 
     95        'console_scripts': ['drq = dreqPy.dreqPy.dreqCmdl:main_entry'], 
    9596        }, 
    9697    ) 
  • CMIP6dreq/trunk/docs/dreqML/packageConfig.py

    r448 r449  
    1515 
    1616__versionComment__ = "Splitting data request content from API" 
    17 __version__ = "01.beta.17" 
     17__version__ = "01.beta.20" 
    1818__title__ = "dreqML" 
    1919__description__ = "CMIP6 Data Request Document" 
  • CMIP6dreq/trunk/docs/setup.py

    r447 r449  
    8686        long_description=read("README.txt"), 
    8787        packages=PACKAGES, 
     88        include_package_data=True, 
    8889        zip_safe=False, 
    8990        classifiers=CLASSIFIERS, 
    9091        install_requires=INSTALL_REQUIRES, 
    91         scripts=['drqHelp'], 
     92        scripts=['dreqML/drqHelp'], 
    9293        data_files = [("", ["LICENSE"])], 
    9394        entry_points= { 
  • CMIP6dreqbuild/trunk/src/framework/Makefile

    r442 r449  
    6262        bash seddreq02.sh "\.\.\/out" "\.\.\/docs" dreqPy/__init__.py > /data/tmp/svn3/exarch/CMIP6dreq/trunk/dreqPy/__init__.py 
    6363        cp htmlTemplates.py dreqPy/scope.py dreqPy/example.py dreqPy/utilities.py /data/tmp/svn3/exarch/CMIP6dreq/trunk/dreqPy   
    64         cp dreqPy/dreqCmdl.py dreqPy/simpleCheck.py /data/tmp/svn3/exarch/CMIP6dreq/trunk/dreqPy 
     64        cp dreqPy/dreqCmdl.py dreqPy/packageConfig.py dreqPy/simpleCheck.py /data/tmp/svn3/exarch/CMIP6dreq/trunk/dreqPy 
    6565        cp vocabDemo.py /data/tmp/svn3/exarch/CMIP6dreq/trunk/dreqPy     
    6666        cp out/annotated_20150731.xml /data/tmp/svn3/exarch/CMIP6dreq/trunk/docs/dreq.xml 
    67         cp LICENSE README.txt setup.py setup.cfg /data/tmp/svn3/exarch/CMIP6dreq/trunk/ 
     67        ### cp LICENSE README.txt setup.py setup.cfg /data/tmp/svn3/exarch/CMIP6dreq/trunk/ 
    6868        cp tables/test.xlsx /data/tmp/svn3/exarch/CMIP6dreq/trunk/docs/CMIP6_MIP_tables.xlsx 
    6969        cp out/dc1.xsd out/xlink.xsd out/xml.xsd /data/tmp/svn3/exarch/CMIP6dreq/trunk/docs/ 
Note: See TracChangeset for help on using the changeset viewer.