From 3d77e7fb1bd7bf034da492d318982227fae5d9c1 Mon Sep 17 00:00:00 2001
From: "Christopher J. Markiewicz" <markiewicz@stanford.edu>
Date: Mon, 14 Mar 2022 14:33:30 -0400
Subject: [PATCH] CI: Drop install_extras, remove hack from env.sh

Also bring setuptools requirement in line with pyproject.toml
---
 setup.py                   |  4 ++--
 tools/ci/env.sh            |  7 +------
 tools/ci/install_extras.sh | 23 -----------------------
 3 files changed, 3 insertions(+), 31 deletions(-)
 delete mode 100755 tools/ci/install_extras.sh

diff --git a/setup.py b/setup.py
index 941df86e..9d91ed15 100644
--- a/setup.py
+++ b/setup.py
@@ -6,9 +6,9 @@
 import versioneer
 
 # Give setuptools a hint to complain if it's too old a version
-# 30.3.0 allows us to put most metadata in setup.cfg
+# 40.8 allows us to put most metadata in setup.cfg
 # Should match pyproject.toml
-SETUP_REQUIRES = ['setuptools >= 30.3.0']
+SETUP_REQUIRES = ['setuptools >= 40.8']
 # This enables setuptools to install wheel on-the-fly
 SETUP_REQUIRES += ['wheel'] if 'bdist_wheel' in sys.argv else []
 
diff --git a/tools/ci/env.sh b/tools/ci/env.sh
index dc4ea101..6d970ef8 100644
--- a/tools/ci/env.sh
+++ b/tools/ci/env.sh
@@ -1,11 +1,6 @@
-SETUP_REQUIRES="pip setuptools>=30.3.0 wheel"
+SETUP_REQUIRES="pip setuptools>=40.8 wheel"
 
 # Numpy and scipy upload nightly/weekly/intermittent wheels
 NIGHTLY_WHEELS="https://pypi.anaconda.org/scipy-wheels-nightly/simple"
 STAGING_WHEELS="https://pypi.anaconda.org/multibuild-wheels-staging/simple"
 PRE_PIP_FLAGS="--pre --extra-index-url $NIGHTLY_WHEELS --extra-index-url $STAGING_WHEELS"
-
-# XXX This is necessary to deal with scipy version metadata mismatches
-# We should aim to remove this ASAP.
-# Last check: 2020.12.19
-PRE_PIP_FLAGS="--use-deprecated=legacy-resolver $PRE_PIP_FLAGS"
diff --git a/tools/ci/install_extras.sh b/tools/ci/install_extras.sh
deleted file mode 100755
index 8942b6a7..00000000
--- a/tools/ci/install_extras.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-echo Installing dependencies
-
-source tools/ci/env.sh
-
-set -eu
-
-# Required variables
-echo EXTRA_PIP_FLAGS = $EXTRA_PIP_FLAGS
-echo CHECK_TYPE = $CHECK_TYPE
-
-set -x
-
-if [ -n "$EXTRA_PIP_FLAGS" ]; then
-    EXTRA_PIP_FLAGS=${!EXTRA_PIP_FLAGS}
-fi
-
-pip install $EXTRA_PIP_FLAGS "fitlins[$CHECK_TYPE]"
-
-set +eux
-
-echo Done installing dependencies