Merge pull request OpenMDAO#1942 from crobinsonut/89824836

Fix conda builds of extensions and bar3simulation

conda-recipes/cobyla/bld.bat

@@ -1,7 +1,12 @@
+SETLOCAL
 cd %SP_DIR%\numpy\distutils\fcompiler
 copy %RECIPE_DIR%\..\numpy.distutils-1.7.1.patch .
 git apply numpy.distutils-1.7.1.patch
 cd %SRC_DIR%
 
 %PYTHON% setup.py install
-%PYTHON% -c "from pkg_resources import get_distribution; print get_distribution('%PKG_NAME%').version" > __conda_version__.txt
+%PYTHON% -c "from pkg_resources import get_distribution; print get_distribution('%PKG_NAME%').parsed_version.base_version" > __conda_version__.txt
+
+TYPE __buildnum__.txt > __conda_buildnum__.txt
+
+ENDLOCAL

conda-recipes/cobyla/meta.yaml

@@ -19,3 +19,5 @@ requirements:
         - python
         - numpy >=1.7.1
         - libpython # [win]
+		
+

conda-recipes/cobyla/run_test.py

@@ -0,0 +1,6 @@
+import cobyla
+import cobyla.cobyla
+from cobyla.cobyla import cobyla
+from cobyla.cobyla import closeunit
+from cobyla.cobyla import openunit
+from cobyla.cobyla import pyflush

conda-recipes/conmin/bld.bat

@@ -1,7 +1,12 @@
+SETLOCAL
 cd %SP_DIR%\numpy\distutils\fcompiler
 copy %RECIPE_DIR%\..\numpy.distutils-1.7.1.patch .
 git apply numpy.distutils-1.7.1.patch
 cd %SRC_DIR%
 
 %PYTHON% setup.py install
-%PYTHON% -c "from pkg_resources import get_distribution; print get_distribution('%PKG_NAME%').version" > __conda_version__.txt
+%PYTHON% -c "from pkg_resources import get_distribution; print get_distribution('%PKG_NAME%').parsed_version.base_version" > __conda_version__.txt
+
+TYPE __buildnum__.txt > __conda_buildnum__.txt
+
+ENDLOCAL

conda-recipes/conmin/run_test.py

@@ -0,0 +1,13 @@
+import conmin
+import conmin.conmin
+from conmin.conmin import conmin
+from conmin.conmin import consav
+from conmin.conmin import cnmn01
+from conmin.conmin import cnmn02
+from conmin.conmin import cnmn03
+from conmin.conmin import cnmn04
+from conmin.conmin import cnmn05
+from conmin.conmin import cnmn06
+from conmin.conmin import cnmn07
+from conmin.conmin import cnmn08
+from conmin.conmin import cnmn1

conda-recipes/newsumt/bld.bat

@@ -1,7 +1,12 @@
+SETLOCAL
 cd %SP_DIR%\numpy\distutils\fcompiler
 copy %RECIPE_DIR%\..\numpy.distutils-1.7.1.patch .
 git apply numpy.distutils-1.7.1.patch
 cd %SRC_DIR%
 
 %PYTHON% setup.py install
-%PYTHON% -c "from pkg_resources import get_distribution; print get_distribution('%PKG_NAME%').version" > __conda_version__.txt
+%PYTHON% -c "from pkg_resources import get_distribution; print get_distribution('%PKG_NAME%').parsed_version.base_version" > __conda_version__.txt
+
+TYPE __buildnum__.txt > __conda_buildnum__.txt
+
+ENDLOCAL

conda-recipes/newsumt/run_test.py

@@ -0,0 +1,6 @@
+import newsumt
+import newsumt.newsumtinterruptible
+from newsumt.newsumtinterruptible import contrl
+from newsumt.newsumtinterruptible import countr
+from newsumt.newsumtinterruptible import newsuminterruptible
+

conda-recipes/openmdao.examples.bar3simulation/bld.bat

@@ -1,9 +1,12 @@
+SETLOCAL
 cd %SP_DIR%\numpy\distutils\fcompiler
 copy %RECIPE_DIR%\..\numpy.distutils-1.7.1.patch .
 git apply numpy.distutils-1.7.1.patch
 cd %SRC_DIR%
 
-cd examples\%PKG_NAME%
-python setup.py bdist_egg
-cd ..
-easy_install -N %PKG_NAME%
+easy_install --no-deps . 
+
+%PYTHON% -c "from pkg_resources import get_distribution; print get_distribution('%PKG_NAME%').parsed_version.base_version" > __conda_version__.txt
+
+TYPE __buildnum__.txt > __conda_buildnum__.txt
+ENDLOCAL

conda-recipes/openmdao.examples.bar3simulation/meta.yaml

@@ -1,18 +1,9 @@
-{% set pkg_version = environ['PKG_VERSION'] %}
-{% set remote = "https://github.com/OpenMDAO/OpenMDAO-Framework.git" %}
-
-{% if pkg_version == "dev" %}
-{% set source="git_url: {}\n  git_branch: {}".format(remote, pkg_version) %}
-{% else %}
-{% set source="  git_url: {}\n  git_branch: {}".format(remote, pkg_version) %}
-{% endif %}
-
 package:
   name: openmdao.examples.bar3simulation
   version: !!str {{ pkg_version }}
 
 source:
-{{ source }}
+    path: ../../examples/openmdao.examples.bar3simulation
 
 build:
     preserve_egg_dir: True
@@ -23,12 +14,16 @@ requirements:
     - numpy ==1.7.1
     - setuptools
     - libpython # [win]
+    - openmdao.main
+    - openmdao.lib
 
   run:
     - python
     - numpy >=1.7.1
     - setuptools
     - libpython # [win]
+    - openmdao.main
+    - openmdao.lib
 
 about:
   home:  http://openmdao.org

conda-recipes/openmdao.examples.bar3simulation/run_test.py

@@ -0,0 +1,5 @@
+import openmdao.examples.bar3simulation
+import openmdao.examples.bar3simulation.bar3
+
+from openmdao.examples.bar3simulation.bar3 import forces
+from openmdao.examples.bar3simulation.bar3 import runbar3truss

conda-recipes/openmdao.lib/meta.yaml

@@ -1,18 +1,9 @@
-{% set pkg_version = environ['PKG_VERSION'] %}
-{% set remote = "https://github.com/OpenMDAO/OpenMDAO-Framework.git" %}
-
-{% if pkg_version == "dev" %}
-{% set source="git_url: {}\n  git_branch: {}".format(remote, pkg_version) %}
-{% else %}
-{% set source="  git_url: {}\n  git_branch: {}".format(remote, pkg_version) %}
-{% endif %}
-
 package:
   name: openmdao.lib
   version: !!str {{ pkg_version }}
 
 source:
-{{ source }}
+    path: ../../openmdao.lib
 
 requirements:
   build:

conda-recipes/slsqp/bld.bat

@@ -1,7 +1,12 @@
+SETLOCAL
 cd %SP_DIR%\numpy\distutils\fcompiler
 copy %RECIPE_DIR%\..\numpy.distutils-1.7.1.patch .
 git apply numpy.distutils-1.7.1.patch
 cd %SRC_DIR%
 
 %PYTHON% setup.py install
-%PYTHON% -c "from pkg_resources import get_distribution; print get_distribution('%PKG_NAME%').version" > __conda_version__.txt
+%PYTHON% -c "from pkg_resources import get_distribution; print get_distribution('%PKG_NAME%').parsed_version.base_version" > __conda_version__.txt
+
+TYPE __buildnum__.txt > __conda_buildnum__.txt
+
+ENDLOCAL

conda-recipes/slsqp/run_test.py

@@ -0,0 +1,6 @@
+import slsqp
+import slsqp.slsqp
+from slsqp.slsqp import closeunit
+from slsqp.slsqp import openunit
+from slsqp.slsqp import pyflush
+from slsqp.slsqp import slsqp

contrib/cobyla/__buildnum__.txt

@@ -0,0 +1 @@
+1

contrib/conmin/__buildnum__.txt

@@ -0,0 +1 @@
+1

contrib/newsumt/__buildnum__.txt

@@ -0,0 +1 @@
+1

contrib/slsqp/__buildnum__.txt

@@ -0,0 +1 @@
+1

examples/openmdao.examples.bar3simulation/__buildnum__.txt

@@ -0,0 +1 @@
+1

examples/openmdao.examples.bar3simulation/setup.py

@@ -14,6 +14,7 @@
                                                  'bar3simulation')))
 
 import releaseinfo
+
 version = releaseinfo.__version__
 
 include_dirs = []