Changeset 7585


Ignore:
Timestamp:
11/10/10 13:25:25 (9 years ago)
Author:
astephen
Message:

Upgraded to be compatible with:

  • python 2.6
  • pylons 1.0
Location:
cows/trunk
Files:
13 edited

Legend:

Unmodified
Added
Removed
  • cows/trunk/README

    r4228 r7585  
    7171 {{{#!python 
    7272 def setup(# ... 
    73            install_requires=['Pylons>=0.9.6.1', 'COWS'], 
     73           install_requires=['Pylons>=1.0', 'COWS'], 
    7474           dependency_links=['http://ndg.nerc.ac.uk/dist'], 
    7575           # ... 
  • cows/trunk/cows/builder.py

    r4912 r7585  
    192192 
    193193    class H: 
    194         def url_for(self): return 'http://example.com/' 
     194        def url(self): return 'http://example.com/' 
    195195    h=H() 
    196196 
  • cows/trunk/cows/pylons/project_templates/cows_server/+package+/templates/demo.html

    r5066 r7585  
    66<?python 
    77 
     8import pylons 
    89 
    910?> 
     
    1415<script src="http://www.openlayers.org/api/OpenLayers.js" type="text/javascript"></script> 
    1516 
    16 <script src="${h.url_for('/demo.js', qualified=True)}" type="text/javascript"></script> 
     17<script src="${pylons.url('/demo.js', qualified=True)}" type="text/javascript"></script> 
    1718 
    1819<script type="text/javascript"> 
    19 var fcURL = "${h.url_for(controller='csmlwms', fileoruri=c.fcName)}"; 
     20var fcURL = "${pylons.url(controller='csmlwms', fileoruri=c.fcName)}"; 
    2021</script> 
    2122 
  • cows/trunk/cows/pylons/project_templates/cows_server/+package+/tests/__init__.py

    r6576 r7585  
    2424import paste.script.appinstall 
    2525from paste.deploy import loadapp 
    26 from routes import url_for 
     26from pylons import url 
    2727 
    28 __all__ = ['url_for', 'TestController'] 
     28__all__ = ['url', 'TestController'] 
    2929 
    3030here_dir = os.path.dirname(os.path.abspath(__file__)) 
  • cows/trunk/cows/pylons/project_templates/cows_server/+package+/tests/functional/test_catalogue.py_tmpl

    r4952 r7585  
    44 
    55    def test_index(self): 
    6         response = self.app.get(url_for(controller='catalogue')) 
     6        response = self.app.get(url(controller='catalogue')) 
    77        # Test response... 
  • cows/trunk/cows/pylons/project_templates/cows_server/+package+/tests/functional/test_csmlwcs.py_tmpl

    r4917 r7585  
    44 
    55    def test_index(self): 
    6         response = self.app.get(url_for(controller='csmlwcs')) 
     6        response = self.app.get(url(controller='csmlwcs')) 
    77        # Test response... 
  • cows/trunk/cows/pylons/project_templates/cows_server/+package+/tests/functional/test_csmlwfs.py_tmpl

    r4917 r7585  
    44 
    55    def test_index(self): 
    6         response = self.app.get(url_for(controller='csmlwfs')) 
     6        response = self.app.get(url(controller='csmlwfs')) 
    77        # Test response... 
  • cows/trunk/cows/pylons/project_templates/cows_server/+package+/tests/functional/test_csmlwms.py_tmpl

    r4917 r7585  
    44 
    55    def test_index(self): 
    6         response = self.app.get(url_for(controller='csmlwms')) 
     6        response = self.app.get(url(controller='csmlwms')) 
    77        # Test response... 
  • cows/trunk/cows/pylons/project_templates/cows_server/+package+/tests/functional/test_demon.py_tmpl

    r5066 r7585  
    44 
    55    def test_index(self): 
    6         response = self.app.get(url_for(controller='demo')) 
     6        response = self.app.get(url(controller='demo')) 
    77        # Test response... 
  • cows/trunk/cows/pylons/templates/catalogue.xml

    r5763 r7585  
    44 
    55from genshi import QName 
    6 from routes import url_for 
    7 from pylons import config,request        
     6from pylons import config, request, url 
     7 
    88if 'cows.cowsclienturl' in config: 
    99        cowsclient = True 
     
    3535        <ul  py:for="fc in allwxs"> 
    3636      <li py:if="cowsclient==True">${fc} 
    37         [<a href="${url_for(controller='csmlwms', fileoruri=fc, id=None, 
     37        [<a href="${url(controller='csmlwms', fileoruri=fc, id=None, 
    3838                            request='GetCapabilities', service='WMS')}" 
    3939                            >WMS</a>] 
    40             [<a href="${url_for(controller='csmlwcs', fileoruri=fc, id=None, 
     40            [<a href="${url(controller='csmlwcs', fileoruri=fc, id=None, 
    4141                            request='GetCapabilities', service='WCS')}" 
    4242                            >WCS</a>] 
    43             [<a href="${url_for(controller='csmlwfs', fileoruri=fc, id=None,  
     43            [<a href="${url(controller='csmlwfs', fileoruri=fc, id=None,  
    4444                            request='GetCapabilities', service='WFS')}" 
    4545                            >WFS</a>] 
    46         [<a href="${url_for(cowsclienturl) + 'ENDPOINT=' + serverurl +url_for(controller='csmlwms', fileoruri=fc, id=None)}" 
     46        [<a href="${url(cowsclienturl) + 'ENDPOINT=' + serverurl +url(controller='csmlwms', fileoruri=fc, id=None)}" 
    4747                            >Visualize</a>] 
    4848      </li> 
    4949          <li py:if="cowsclient!=True">${fc} 
    50         [<a href="${url_for(controller='csmlwms', fileoruri=fc, id=None, 
     50        [<a href="${url(controller='csmlwms', fileoruri=fc, id=None, 
    5151                            request='GetCapabilities', service='WMS')}" 
    5252                            >WMS</a>] 
    53             [<a href="${url_for(controller='csmlwcs', fileoruri=fc, id=None, 
     53            [<a href="${url(controller='csmlwcs', fileoruri=fc, id=None, 
    5454                            request='GetCapabilities', service='WCS')}" 
    5555                            >WCS</a>] 
    56             [<a href="${url_for(controller='csmlwfs', fileoruri=fc, id=None,  
     56            [<a href="${url(controller='csmlwfs', fileoruri=fc, id=None,  
    5757                            request='GetCapabilities', service='WFS')}" 
    5858                            >WFS</a>] 
    59             [<a href="${url_for(controller='demo', fileoruri=fc)}" 
     59            [<a href="${url(controller='demo', fileoruri=fc)}" 
    6060                            >Demo</a>] 
    6161      </li>      
     
    6363        <ul  py:for="fc in wfsonly"> 
    6464      <li >${fc} 
    65             [<a href="${url_for(controller='csmlwfs', fileoruri=fc, id=None,  
     65            [<a href="${url(controller='csmlwfs', fileoruri=fc, id=None,  
    6666                            request='GetCapabilities', service='WFS')}" 
    6767                            >WFS</a>] 
  • cows/trunk/cows/test/testapp/public/index.html

    r4613 r7585  
    8181 
    8282&lt;p&gt; 
    83 The URL you called: ${h.url_for()} 
     83The URL you called: ${url()} 
    8484&lt;/p&gt; 
    8585 
  • cows/trunk/cows/test/testapp/tests/__init__.py

    r4912 r7585  
    2424import paste.script.appinstall 
    2525from paste.deploy import loadapp 
    26 from routes import url_for 
     26from pylons import url 
    2727 
    28 __all__ = ['url_for', 'TestController'] 
     28__all__ = ['url', 'TestController'] 
    2929 
    3030conf_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) 
  • cows/trunk/setup.py

    r6576 r7585  
    1010setup( 
    1111    name='cows', 
    12     version='1.5.1', 
     12    version='1.6.0', 
    1313     
    1414    description='CEDA OGC Web Services Framework (COWS).  A framework for creatining integrated OGC web services using Pylons', 
     
    1919    # We only list dependencies that we are confident will easy_install without 
    2020    # a hitch here. 
    21     install_requires=['Pylons==0.9.6.1', 'genshi', 'numpy==1.3.0', 'cdat_lite', 'csml', 
    22                       'matplotlib>=0.98'], 
     21    install_requires=['Pylons>=1.0', 'genshi>=0.6', 'numpy==1.3.0', 'cdat_lite>=5.2', 'csml>=2.7', 
     22                      'pycairo>=1.2', 'Shapely>=1.2.5', 'PIL>=1.1.7',  
     23                      'matplotlib==1.0.0', 'basemap==1.0.0', 
     24                      'mock>=1.7', 'owslib==0.3.1', 'geoplot>=0.4.0', 'image_utils>=1.1.0'], 
    2325    find_links=['http://ndg.nerc.ac.uk/dist'], 
    2426 
Note: See TracChangeset for help on using the changeset viewer.