Changeset 6f44bfb in sasview


Ignore:
Timestamp:
Dec 16, 2011 9:14:27 AM (12 years ago)
Author:
Mathieu Doucet <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:
f6f0c7b
Parents:
7680760
Message:

Re #3 Refactoring version handling

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • build_tools/get_version.py

    re0c830a r6f44bfb  
    11__revision__ = filter(str.isdigit, "$Revision$") 
    22__version__ = "0.0.0" 
    3 try: 
    4     import sans.sansview 
    5     __version__ = sans.sansview.__version__ 
    6 except: 
    7     print "Could not load sansview module" 
    83     
    94def get_svn_revision(path=None): 
     
    4035    print "Could not extract revision number" 
    4136 
     37# Get the version number from the sansview module 
     38# Check to see if we are dealing with a release 
     39try: 
     40    import sans.sansview 
     41    __version__ = sans.sansview.__version__ 
    4242     
     43    if sans.sansview.__is_release__: 
     44        __revision__ = None 
     45except: 
     46    print "Could not load sansview module" 
     47     
  • build_tools/rpm/create_rpm_spec.py

    r3fa4bbd r6f44bfb  
    44 
    55revision = get_version.__revision__ 
    6 if len(sys.argv)>1: 
     6 
     7# If the revision we got from get_version is None, it's because it's 
     8# release. Otherwise, use the input revision if provided 
     9if len(sys.argv)>1 and revision is not None: 
    710    try: 
    811        revision = int(sys.argv[1].strip()) 
     
    2629    return newline 
    2730 
    28  
    2931input=open("sansview.spec.template",'r') 
    3032output=open("sansview.spec",'w') 
     
    3537    new_line = replaceToken(l, "[VERSION]", get_version.__version__) 
    3638    new_line = replaceToken(new_line, "[REVISION]", str(revision)) 
     39     
     40    # If this is a release, the revision number will come out as None 
     41    if revision is None and new_line.find("Release")>=0: 
     42        continue 
     43     
    3744    output.write(new_line+'\n') 
    3845     
  • sansview/__init__.py

    ree1e4b20 r6f44bfb  
    1 __version__ = "0.0.0" 
     1__version__ = "2.0.1" 
     2__is_release__ = False 
Note: See TracChangeset for help on using the changeset viewer.