Merge pull request #45 from thewtex/group-tweaks

Group tweaks

Author: thewtex

scripts/internal/manylinux-build-wheels.sh

@@ -137,13 +137,8 @@ for PYBIN in "${PYBINARIES[@]}"; do
         echo "Skipping ${PYBIN}"
         continue
     fi
-    if [[ ${SINGLE_WHEEL} == 1 ]]; then
-        package="itk"
-    else
-        package="itk-meta"
-    fi
-    ${PYBIN}/pip install ${package} --no-cache-dir --no-index -f /work/dist
     ${PYBIN}/pip install numpy
+    ${PYBIN}/pip install itk --no-cache-dir --no-index -f /work/dist
     (cd $HOME && ${PYBIN}/python -c 'from itk import ITKCommon;')
     (cd $HOME && ${PYBIN}/python -c 'import itk; image = itk.Image[itk.UC, 2].New()')
     (cd $HOME && ${PYBIN}/python -c 'import itkConfig; itkConfig.LazyLoading = False; import itk;')

scripts/macpython-build-wheels.sh

@@ -167,13 +167,8 @@ ${DELOCATE_WHEEL} ${SCRIPT_DIR}/../dist/*.whl # copies library dependencies into
 
 # Install packages and test
 for VENV in "${VENVS[@]}"; do
-    if [[ ${SINGLE_WHEEL} == 1 ]]; then
-        package="itk"
-    else
-        package="itk-meta"
-    fi
-    ${VENV}/bin/pip install ${package} --no-cache-dir --no-index -f ${SCRIPT_DIR}/../dist
     ${VENV}/bin/pip install numpy
+    ${VENV}/bin/pip install itk --no-cache-dir --no-index -f ${SCRIPT_DIR}/../dist
     (cd $HOME && ${VENV}/bin/python -c 'import itk;')
     (cd $HOME && ${VENV}/bin/python -c 'import itk; image = itk.Image[itk.UC, 2].New()')
     (cd $HOME && ${VENV}/bin/python -c 'import itkConfig; itkConfig.LazyLoading = False; import itk;')

scripts/setup_py_configure.py

@@ -139,7 +139,10 @@ def update_wheel_setup_py_parameters():
         params['SETUP_GENERATOR'] = "python %s '%s'" % (SCRIPT_NAME, wheel_name)
 
         # name
-        params['SETUP_NAME'] = wheel_name
+        if wheel_name == 'itk-meta':
+            params['SETUP_NAME'] = 'itk'
+        else:
+            params['SETUP_NAME'] = wheel_name
 
         # cmake_args
         params['SETUP_CMAKE_ARGS'] = list_to_str([
@@ -184,6 +187,7 @@ def get_wheel_dependencies():
         wheel_name for wheel_name in get_wheel_names()
         if wheel_name != 'itk-meta'
         ]
+    all_depends['itk-meta'].append('numpy')
     return all_depends