Changeset 686fd10 in sasview


Ignore:
Timestamp:
Jul 2, 2015 1:16:33 PM (9 years ago)
Author:
Doucet, Mathieu <doucetm@…>
Branches:
master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
805f07a
Parents:
3a5f7c8
Message:

Update update url

Files:
3 edited

Legend:

Unmodified
Added
Removed

  • sasview/local_config.py

    r5846bb5 r686fd10  
    1313__build__ = sas.sasview.__build__ 
    1414__download_page__ = 'https://github.com/SasView/sasview/releases' 
    15 __update_URL__ = ['raw.githubusercontent.com', 
    16                   '/SasView/sasview/master/sasview.latestversion'] 
     15__update_URL__ = 'http://www.sasview.org/sasview.latestversion' 
    1716 
    1817 

  • src/sas/guiframe/config.py

    r5846bb5 r686fd10  
    1010__build__ = '1' 
    1111__download_page__ = 'https://github.com/SasView/sasview/releases' 
    12 __update_URL__ = ['raw.githubusercontent.com', 
    13                   '/SasView/sasview/master/sasview.latestversion'] 
     12__update_URL__ = 'http://www.sasview.org/sasview.latestversion' 
    1413 
    1514 

  • src/sas/guiframe/gui_manager.py

    rf7d2f4a r686fd10  
    20432043        """ 
    20442044        try: 
    2045             req = urllib2.Request('https://github.com/SasView/sasview/releases/latest') 
     2045            req = urllib2.Request(config.__update_URL__) 
    20462046            res = urllib2.urlopen(req) 
    2047             get_url= res.geturl() 
    2048             content = get_url.partition('/v')[2] 
    2049             logging.info("connected to GitHub. sasview.latestversion = %s" 
     2047            content = res.read().strip() 
     2048            logging.info("Connected to www.sasview.org. Latest version: %s" 
    20502049                         % (content)) 
    20512050        except: 
    20522051            msg = traceback.format_exc() 
    20532052            logging.info(msg) 
    2054             logging.info("failed to connect to GitHub") 
     2053            logging.info("Failed to connect to www.sasview.org") 
    20552054            content = "0.0.0" 
    20562055 
Note: See TracChangeset for help on using the changeset viewer.