From aaade0bd464668979411f214fa18d49b9a67d29b Mon Sep 17 00:00:00 2001
From: Michael-T-McCann <michael.thompson.mccann@gmail.com>
Date: Thu, 10 Mar 2022 11:27:12 -0700
Subject: [PATCH] Try to get astra install working in workflow

---
 .github/workflows/pytest.yml     | 17 ++++++++---------
 scico/conftest.py => conftest.py |  0
 setup.py                         |  3 +++
 3 files changed, 11 insertions(+), 9 deletions(-)
 rename scico/conftest.py => conftest.py (100%)

diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
index 715befad5..dfc88bc06 100644
--- a/.github/workflows/pytest.yml
+++ b/.github/workflows/pytest.yml
@@ -24,25 +24,24 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: recursive
-      - name: Install Python 3
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.8
       - name: Install dependencies
         run: |
+          echo $CONDA/bin >> $GITHUB_PATH
+          conda install python=3.8
           python -m pip install --upgrade pip
           sudo apt-get install -y libopenblas-dev
-          pip install pytest-cov
+          conda install -c conda-forge pytest-cov
           pip install -r requirements.txt
           pip install -r dev_requirements.txt
           conda install -c astra-toolbox astra-toolbox
-          pip install ray[tune]
+          conda install -c conda-forge pyyaml
+          pip install "ray[tune]"
           pip install hyperopt
           pip install -e .
       - name: Run tests with pytest
-        run: pytest --cov=scico --cov-report=xml
-      - name: Run doctests
-        run: pytest --doctest-modules scico
+        run: |
+          pytest --cov=scico --cov-report=xml
+          pytest --ignore-glob="*test_*.py" --doctest-modules scico
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v2
         with:
diff --git a/scico/conftest.py b/conftest.py
similarity index 100%
rename from scico/conftest.py
rename to conftest.py
diff --git a/setup.py b/setup.py
index 06cc5b05c..19241f1bb 100644
--- a/setup.py
+++ b/setup.py
@@ -5,6 +5,7 @@
 
 import os
 import os.path
+import site
 from ast import parse
 
 from setuptools import find_packages, setup
@@ -75,6 +76,8 @@ def get_init_variable_value(var):
         lines = f.readlines()
     extras_require[extras_label] = [line.strip() for line in lines if line[0:2] != "-r"]
 
+# PEP517 workaround
+site.ENABLE_USER_SITE = True
 
 setup(
     name=name,