Move some pythran config from CI to setup

It's more reproducible and less configuration hassle that way. Somehow related to scipy#13464.
01halibut · Feb 1, 2021 · 2f2b0ea · 2f2b0ea
1 parent 54f8d14
commit 2f2b0ea
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -315,9 +315,9 @@ jobs:
           $env:CFLAGS = "-m32"
           $env:LDFLAGS = "-m32"
           refreshenv
-          python -c "import os; fd = open(os.path.expanduser(os.path.join('~', '.pythranrc')), 'w'); fd.write('[compiler]\nCXX=clang-cl.exe\nCC=clang-cl.exe\ncflags=/std:c++14 -m32\nblas=none\n'); fd.close()"
+          python -c "import os; fd = open(os.path.expanduser(os.path.join('~', '.pythranrc')), 'w'); fd.write('[compiler]\nCXX=clang-cl.exe\nCC=clang-cl.exe\ncflags=/std:c++14 -m32\n'); fd.close()"
       }else{
-          python -c "import os; fd = open(os.path.expanduser(os.path.join('~', '.pythranrc')), 'w'); fd.write('[compiler]\nCXX=clang-cl.exe\nCC=clang-cl.exe\nblas=none\n'); fd.close()"
+          python -c "import os; fd = open(os.path.expanduser(os.path.join('~', '.pythranrc')), 'w'); fd.write('[compiler]\nCXX=clang-cl.exe\nCC=clang-cl.exe\n'); fd.close()"
       }
       $env:PATH = "C:\\ProgramData\\chocolatey\\lib\\mingw\\tools\\install\\mingw$(BITS)\\bin;" + $env:PATH
 

diff --git a/scipy/optimize/setup.py b/scipy/optimize/setup.py
@@ -101,7 +101,8 @@ def configuration(parent_package='', top_path=None):
         import pythran
         ext = pythran.dist.PythranExtension(
             'scipy.optimize._group_columns',
-            sources=["scipy/optimize/_group_columns.py"])
+            sources=["scipy/optimize/_group_columns.py"],
+            config=['compiler.blas=none'])
         config.ext_modules.append(ext)
     else:
         config.add_extension('_group_columns', sources=['_group_columns.c'],)

diff --git a/scipy/signal/setup.py b/scipy/signal/setup.py
@@ -25,12 +25,14 @@ def configuration(parent_package='', top_path=None):
         import pythran
         ext = pythran.dist.PythranExtension(
             'scipy.signal._max_len_seq_inner',
-            sources=["scipy/signal/_max_len_seq_inner.py"])
+            sources=["scipy/signal/_max_len_seq_inner.py"],
+            config=['compiler.blas=none'])
         config.ext_modules.append(ext)
 
         ext = pythran.dist.PythranExtension(
             'scipy.signal._spectral',
-            sources=["scipy/signal/_spectral.py"])
+            sources=["scipy/signal/_spectral.py"],
+            config=['compiler.blas=none'])
         config.ext_modules.append(ext)
     else:
         config.add_extension(