diff options
| -rw-r--r-- | .github/workflows/cygwin.yml | 3 | ||||
| -rw-r--r-- | tools/list_installed_dll_dependencies_cygwin.sh | 9 | ||||
| -rw-r--r-- | tools/list_numpy_dlls.sh | 9 |
3 files changed, 15 insertions, 6 deletions
diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml index 1bfe9a9a7..89320358a 100644 --- a/.github/workflows/cygwin.yml +++ b/.github/workflows/cygwin.yml @@ -49,6 +49,9 @@ jobs: - name: Install new NumPy run: | bash -c "/usr/bin/python3.8 -m pip install dist/numpy-*cp38*.whl" + - name: Rebase NumPy compiled extensions + run: | + bash -c "/usr/bin/rebase --database --oblivious `/bin/dash tools/list_numpy_dlls.sh 3.8`" - name: Run NumPy test suite run: >- dash -c "/usr/bin/python3.8 runtests.py -n -vv" diff --git a/tools/list_installed_dll_dependencies_cygwin.sh b/tools/list_installed_dll_dependencies_cygwin.sh index 240f26800..ee06ae0d0 100644 --- a/tools/list_installed_dll_dependencies_cygwin.sh +++ b/tools/list_installed_dll_dependencies_cygwin.sh @@ -12,10 +12,7 @@ # /bin/sh py_ver=${1} -site_packages=$(python${py_ver} -m pip show numpy | \ - grep Location | cut -d " " -f 2 -); -dll_list=$(for name in $(python${py_ver} -m pip show -f numpy | \ - grep -F .dll); do echo ${site_packages}/${name}; done) +dll_list=`/bin/dash tools/list_numpy_dlls.sh ${py_ver}` echo "Checks for existence, permissions and file type" ls -l ${dll_list} file ${dll_list} @@ -29,10 +26,10 @@ cd dist/ for name in ${dll_list}; do echo ${name} - ext_module=$(echo ${name} | \ + ext_module=`echo ${name} | \ sed -E \ -e "s/^\/+(home|usr).*?site-packages\/+//" \ -e "s/.cpython-3.m?-x86(_64)?-cygwin.dll$//" \ - -e "s/\//./g") + -e "s/\//./g"` python${py_ver} -c "import ${ext_module}" done diff --git a/tools/list_numpy_dlls.sh b/tools/list_numpy_dlls.sh new file mode 100644 index 000000000..fedd2097b --- /dev/null +++ b/tools/list_numpy_dlls.sh @@ -0,0 +1,9 @@ +#!/bin/dash +# Print the list of dlls installed by NumPy + +py_ver=${1} +site_packages=`python${py_ver} -m pip show numpy | \ + grep Location | cut -d " " -f 2 -`; +dll_list=`for name in $(python${py_ver} -m pip show -f numpy | \ + grep -F .dll); do echo ${site_packages}/${name}; done` +echo ${dll_list} |