Changeset 4705 for install

Timestamp:

Jan 3, 2021 2:36:36 PM (2 years ago)

Author:

toby

Message:

now work on g2complete

Location:

install

Files:

• g2full/construct.yaml.template (modified) (2 diffs)
• setversion.py (modified) (1 diff)

install/g2full/construct.yaml.template

@@ -9 +9 @@
     - python>=3.7
     - conda
-    - numpy>=1.18
+    - numpy=1.19
     - scipy
-    - matplotlib=3.0
+    - matplotlib>=3.3
     - pillow
     - pyopengl
@@ -24 +24 @@
     - pyparsing
     - C:\Jenkins\g2builds\win-64\gsas2complete-**Version**-0.tar.bz2 [win]
-    - ~/builds/osx-64\gsas2complete-**Version**-0.tar.bz2 [osx]
+    - ~/builds/osx-64/gsas2complete-**Version**-0.tar.bz2 [win]
+    - ~/builds/linux-64/gsas2complete-**Version**-0.tar.bz2 [linux]
 
 #exclude:

install/setversion.py

@@ -44 +44 @@
         print('changing for 32-bit windows')
         out = out.replace('win-64','win-32')
+    if sys.platform == "win32" and platform.architecture()[0] != '32bit':
+        print('changing for 32-bit linux')
+        out = out.replace('linux-64','linux-32')
     fp.close()
     print('Creating',fil)