Changeset 5142


Ignore:
Timestamp:
26/03/09 13:44:17 (11 years ago)
Author:
spascoe
Message:

Merged the nappy-eggable branch into trunk.

See README_EGG for details and some TODO items.

Location:
nappy/trunk
Files:
5 deleted
4 edited
4 copied

Legend:

Unmodified
Added
Removed
  • nappy/trunk

    • Property svn:ignore set to
      *.egg-info
  • nappy/trunk/README_EGG

    r5073 r5142  
    1515The tests have been slightly reorganised.  They can be run from a checkout with "nosetests" or "python setup.py test" 
    1616 
     17== TODO == 
     18 
     19Before release we should: 
     20 
     21 1. Agree a version number 
     22 2. Add metadata to setup.py 
     23 3. Ensure all tests pass.  Some require files that aren't present in svn -- 
     24    presumably they were generated manually. 
     25 
     26On release it would be good to: 
     27 
     28 1. Add egg to http://ndg.nerc.ac.uk/dist 
     29 3. Upload egg to PyPI 
  • nappy/trunk/nappy/utils/parse_config.py

    r3988 r5142  
    1111import os 
    1212 
     13 
    1314# Global variables 
    14 base_dir = os.environ.get("NAPPY_BASE_DIR", ".." + os.path.sep + "..") 
     15 
     16# base_dir is taken from the environment first and then from nappy.config 
     17# as a fallback. 
     18if 'NAPPY_BASE_DIR' in os.environ: 
     19    base_dir = os.environ["NAPPY_BASE_DIR"] 
     20else: 
     21    _here = os.path.dirname(__file__) 
     22    base_dir = os.path.join(_here, '../config') 
     23 
    1524config_file = os.path.join(base_dir, "nappy.ini") 
    1625config_dict = None 
  • nappy/trunk/setup.py

    r4353 r5142  
    11""" 
    2 This trivial setup.py script is designed to allow nappy to be deployed 
    3 as a develop-egg with zc.buildout.  It does not imply the ability to make a 
    4 nappy egg or install with distutils. 
    52 
    63""" 
    74 
    8 print """ 
    9 ###################################################################### 
    10 ## WARNING: This setup.py only works as part of a zc.buildout buildout 
    11 ###################################################################### 
    12 """ 
     5from setuptools import setup, find_packages 
    136 
    14 from setuptools import setup 
    15 setup(name='nappy') 
     7setup(name='nappy', 
     8      #!TODO: Ag, comment on the version.  I'm assuming this code will become 
     9      #       0.9.8 eventually. 
     10      version='0.9.8pre1', 
     11 
     12      #!TODO: metadata from Ag 
     13      description = 'NASA Ames Package in Python', 
     14      #long_description = __doc__, 
     15      #licence = '', 
     16      #keywords = '', 
     17      author = 'Ag Stephens', 
     18      author_email = 'ag.stephens@stfc.ac.uk', 
     19      #url = '', 
     20      #classifiers = [], 
     21 
     22      # We make the package non-zip_safe so that we don't need to 
     23      # change the way ini files are read too much. 
     24      packages = find_packages(exclude=['tests', 'tests.*']), 
     25      include_package_data = True, 
     26      zip_safe = False, 
     27 
     28      tests_require = ['nose'], 
     29      test_suite = 'nose.collector', 
     30 
     31      entry_points = ''' 
     32      [console_scripts] 
     33      na2nc = nappy.script.na2nc:na2nc 
     34      nc2na = nappy.script.nc2na:nc2na 
     35      ''', 
     36       
     37      ) 
  • nappy/trunk/test_outputs

    • Property svn:ignore set to
      *
Note: See TracChangeset for help on using the changeset viewer.