Changeset 4705 for install


Ignore:
Timestamp:
Jan 3, 2021 2:36:36 PM (9 months ago)
Author:
toby
Message:

now work on g2complete

Location:
install
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • install/g2full/construct.yaml.template

    r4442 r4705  
    99    - python>=3.7
    1010    - conda
    11     - numpy>=1.18
     11    - numpy=1.19
    1212    - scipy
    13     - matplotlib=3.0
     13    - matplotlib>=3.3
    1414    - pillow
    1515    - pyopengl
     
    2424    - pyparsing
    2525    - C:\Jenkins\g2builds\win-64\gsas2complete-**Version**-0.tar.bz2 [win]
    26     - ~/builds/osx-64\gsas2complete-**Version**-0.tar.bz2 [osx]
     26    - ~/builds/osx-64/gsas2complete-**Version**-0.tar.bz2 [win]
     27    - ~/builds/linux-64/gsas2complete-**Version**-0.tar.bz2 [linux]
    2728
    2829#exclude:
  • install/setversion.py

    r4240 r4705  
    4444        print('changing for 32-bit windows')
    4545        out = out.replace('win-64','win-32')
     46    if sys.platform == "win32" and platform.architecture()[0] != '32bit':
     47        print('changing for 32-bit linux')
     48        out = out.replace('linux-64','linux-32')
    4649    fp.close()
    4750    print('Creating',fil)
Note: See TracChangeset for help on using the changeset viewer.