Changeset 4710

Timestamp:

Jan 4, 2021 12:50:48 PM (3 years ago)

Author:

toby

Message:

set package versions from conda versions

Location:

install

Files:

• g2complete/bld.bat.template (added)
• g2complete/build.sh.template (added)
• g2complete/meta.yaml.template (modified) (1 diff)
• g2full/construct.yaml.template (modified) (1 diff)
• setversion.py (modified) (1 diff)

install/g2complete/meta.yaml.template

@@ -11 +11 @@
 requirements:
   run:
-    - python>=3.8
+    - python=**pyversion**
+    - numpy=**npversion**
+    - matplotlib=**mplversion**
+    - wxpython=**wxversion**
     - conda
-    - numpy=1.19     # note hard coded in bld.bat and build.sh
     - scipy
-    - matplotlib>=3.3
     - pillow
     - pyopengl
-    - wxpython<4.1
     - svn
     - hdf5

install/g2full/construct.yaml.template

@@ -4 +4 @@
 
 channels:
-  - https://repo.continuum.io/pkgs/main//linux-64
-  - https://repo.continuum.io/pkgs/main/noarch
-  - https://conda.anaconda.org/conda-forge/linux-64
-  - https://conda.anaconda.org/conda-forge/noarch
+  - https://repo.continuum.io/pkgs/main
+  - https://conda.anaconda.org/conda-forge
   
 specs:
-    - python>=3.8
-    - conda
-    - numpy=1.19
-    - scipy
-    - matplotlib>=3.3
+    - python=**pyversion**
+    - numpy=**npversion**
+    - matplotlib=**mplversion**
+    - wxpython=**wxversion**
     - pillow
     - pyopengl
-    - wxpython<4.1
+    - scipy
+    - conda
     - svn
     - hdf5

install/setversion.py

@@ -34 +34 @@
     if line.startswith('Rev'):
         version = line.split()[1].strip()
+        print ('Version is {}'.format(out))
         break
 else:
     print ('Version not found!\nout=%s'%out)
     sys.exit(1)
-for fil in 'g2complete/meta.yaml','g2full/construct.yaml':
-    fp = open(fil+'.template','r')
-    out = fp.read().replace('**Version**',version)
+
+import numpy as np
+import wx
+import matplotlib as mpl
+import platform
+npversion = np.__version__[:np.__version__.find('.',2)]
+#wxversion = wx.__version__[:wx.__version__.find('.',2)]
+wxversion = wx.__version__
+mplversion = mpl.__version__[:mpl.__version__.find('.',2)]
+pyversion = platform.python_version()
+if pyversion.find('.',2) > 0: pyversion = pyversion[:pyversion.find('.',2)]
+print ('SVN version is    {}'.format(version))
+print ('python version is {}'.format(pyversion))
+print ('numpy version is  {}'.format(npversion))
+print ('wx version is     {}'.format(wxversion))
+print ('MPL version is    {}'.format(mplversion))
+
+for fil in ('g2complete/meta.yaml','g2complete/build.sh',
+                'g2complete/bld.bat',
+                'g2full/construct.yaml',
+                ):
+    try:
+        fp = open(fil+'.template','r')
+        out = fp.read().replace('**Version**',version)
+        fp.close()
+    except FileNotFoundError:
+        print('Skipping ',fil)
+        continue
     if sys.platform == "win32" and platform.architecture()[0] != '64bit':
         print('changing for 32-bit windows')
         out = out.replace('win-64','win-32')
-    if sys.platform == "win32" and platform.architecture()[0] != '32bit':
+    if sys.platform.startswith("linux") and platform.architecture()[0] != '32bit':
         print('changing for 32-bit linux')
         out = out.replace('linux-64','linux-32')
-    fp.close()
+    out = out.replace('**pyversion**',pyversion)
+    out = out.replace('**npversion**',npversion)
+    out = out.replace('**wxversion**',wxversion)
+    out = out.replace('**mplversion**',mplversion)
     print('Creating',fil)
     fp = open(fil,'w')