Merge pull request #138 from mattip/issue137

replace backslash with forward slash in get_pkg_config

Author: mattip

.github/workflows/windows.yml

@@ -55,6 +55,13 @@ jobs:
         if ( ${{ matrix.INTERFACE64 }} -eq "1" ) {
           echo "INTERFACE64=1" >> $env:GITHUB_ENV
         }
+        $CIBW = "${{ github.workspace }}/.openblas"
+        $CIBW = $CIBW.replace("\","/")
+        echo "CIBW_ENVIRONMENT_WINDOWS=PKG_CONFIG_PATH=$CIBW" >> $env:GITHUB_ENV
+
+    - name: Debug
+      run: |
+        echo CIBW_ENVIRONMENT_WINDOWS=$env:CIBW_ENVIRONMENT_WINDOWS
 
     - name: Build
       run: |
@@ -113,6 +120,9 @@ jobs:
             sed -e "s/openblas64/openblas32/" -i local/scipy_openblas32/__init__.py
             sed -e "s/openblas64/openblas32/" -i local/scipy_openblas32/__main__.py
         fi
+        echo "" >> LICENSE.txt
+        echo "----" >> LICENSE.txt
+        echo "" >> LICENSE.txt
         cat tools/LICENSE_win32.txt >> LICENSE.txt
         python -m pip wheel -w dist -vv .
         # move the mis-named scipy_openblas64-none-any.whl to a platform-specific name
@@ -136,17 +146,17 @@ jobs:
 
     - name: Test 64-bit interface wheel
       if: matrix.INTERFACE64 == '1'
-      shell: bash
       run: |
         python -m pip install --no-index --find-links dist scipy_openblas64
         python -m scipy_openblas64
+        python -c "import scipy_openblas64; print(scipy_openblas64.get_pkg_config())"
 
     - name: Test 32-bit interface wheel
       if: matrix.INTERFACE64 != '1'
-      shell: bash
       run: |
         python -m pip install --no-index --find-links dist scipy_openblas32
         python -m scipy_openblas32
+        python -c "import scipy_openblas32; print(scipy_openblas32.get_pkg_config())"
 
     - uses: conda-incubator/[email protected]
       with:

LICENSE renamed to LICENSE.txt

@@ -84,7 +84,7 @@ def get_pkg_config(use_preloading=False):
         Libs: {libs_flags}
         Libs.private: ${{extralib}}
         Cflags: -I${{includedir}} {cflags}
-        """)
+        """).replace("\\", "/")
 
 
 if sys.platform == "win32":

local/scipy_openblas64/__init__.py

@@ -8,7 +8,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "scipy-openblas64"
-version = "0.3.26.0.3"
+version = "0.3.26.0.4"
 requires-python = ">=3.7"
 description = "Provides OpenBLAS for python packaging"
 readme = "README.md"

pyproject.toml

@@ -33,17 +33,19 @@ if [[ $py_version != $pkg_version* ]]; then
   echo Version from pyproject.toml "$py_version" does not match version from build "pkg_version"
   exit 1
 fi
-# Do not package the pkgconfig stuff, use the wheel functionality instead
-rm -rf local/scipy_openblas64/lib/pkgconfig
 
+rm -rf local/scipy_openblas64/lib/pkgconfig
+echo "" >> LICENSE.txt
+echo "----" >> LICENSE.txt
+echo "" >> LICENSE.txt
 if [ $(uname) == "Darwin" ]; then
     cat tools/LICENSE_osx.txt >> LICENSE.txt
 else
     cat tools/LICENSE_linux.txt >> LICENSE.txt
 fi
 
 if [ "${INTERFACE64}" != "1" ]; then
-    # rewrite the name of the project to scipy_openblas32
+    # rewrite the name of the project to scipy-openblas32
     # this is a hack, but apparently there is no other way to change the name
     # of a pyproject.toml project
     #