From 89170c4b0967db60c3744b8a382670cb867a9382 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filipe=20Brand=C3=A3o?= <fdabrandao@gmail.com>
Date: Mon, 26 Feb 2024 19:10:56 +0000
Subject: [PATCH] nlwpy: try to configure cibuildwheel directly from
 pyproject.toml

---
 azure-pipelines.yml       | 10 +++++-----
 nl-writer2/pyproject.toml | 18 ++++++++++++++----
 nl-writer2/setup.py       |  1 -
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 10896ffc7..0e9d2e47f 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,8 +1,8 @@
-variables:
-  CIBW_SKIP: pp* cp27-* *_i686 *-win32 *musllinux*
-  CIBW_ARCHS_MACOS: x86_64 universal2
-  CIBW_TEST_COMMAND: pytest --pyargs nlwpy.test
-  CIBW_TEST_REQUIRES: --index-url https://pypi.ampl.com --extra-index-url https://pypi.org/simple ampl_module_base ampl_module_gurobi ampl_module_highs ampl_module_minos amplpy pytest pandas numpy scipy
+# variables:
+#   CIBW_SKIP: pp* cp27-* *_i686 *-win32 *musllinux*
+#   CIBW_ARCHS_MACOS: x86_64 universal2
+#   CIBW_TEST_COMMAND: pytest --pyargs nlwpy.test
+#   CIBW_TEST_REQUIRES: --index-url https://pypi.ampl.com --extra-index-url https://pypi.org/simple ampl_module_base ampl_module_gurobi ampl_module_highs ampl_module_minos amplpy pytest pandas numpy scipy
 
 stages:
 - stage: native
diff --git a/nl-writer2/pyproject.toml b/nl-writer2/pyproject.toml
index 2b0fb5ef4..e50cec73a 100644
--- a/nl-writer2/pyproject.toml
+++ b/nl-writer2/pyproject.toml
@@ -5,12 +5,22 @@ requires = [
 ]
 build-backend = "setuptools.build_meta"
 
-
 [tool.cibuildwheel]
-test-requires = "numpy scipy"
-test-command = "python {project}/nlwpy/tests/test.py"
-test-skip = "*universal2:arm64"
+skip = ["pp*", "cp27-*", "*_i686", "*-win32", "*musllinux*"]
+test-requires = [
+  "--index-url https://pypi.ampl.com",
+  "--extra-index-url https://pypi.org/simple",
+  "ampl_module_base",
+  "ampl_module_gurobi",
+  "ampl_module_highs",
+  "ampl_module_minos",
+  "amplpy", "pandas",
+  "numpy", scipy", "pytest"]
+test-command = "pytest --pyargs nlwpy.test"
 
+[tool.cibuildwheel.macos]
+test-skip = "*universal2"
+archs = ["x86_64", "universal2"]
 
 [tool.ruff]
 target-version = "py37"
diff --git a/nl-writer2/setup.py b/nl-writer2/setup.py
index 59350dd0f..516a9db81 100644
--- a/nl-writer2/setup.py
+++ b/nl-writer2/setup.py
@@ -1,4 +1,3 @@
-# Available at setup time due to pyproject.toml
 from setuptools import setup, Extension
 import pybind11
 import glob