From 823f3bfa285557daa77742169df668633c87117a Mon Sep 17 00:00:00 2001
From: Timotej Bernat <tibe3324@colorado.edu>
Date: Tue, 13 Aug 2024 12:36:12 -0600
Subject: [PATCH 1/2] Got rid of jina2 flags blindly copy-pasted in prior PR

---
 .github/workflows/CI.yaml | 35 ++++-------------------------------
 1 file changed, 4 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml
index 8530d81..3478062 100644
--- a/.github/workflows/CI.yaml
+++ b/.github/workflows/CI.yaml
@@ -34,53 +34,26 @@ jobs:
           uname -a
           df -h
           ulimit -a
-{% if cookiecutter.dependency_source == 'Dependencies from pip only (no conda)' %}
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
 
-      - name: Testing Dependencies
-        shell: bash
-        run: |
-          python -m pip install -U pytest pytest-cov codecov
-{% else %}
       # More info on options: https://github.com/marketplace/actions/setup-micromamba
       - uses: mamba-org/setup-micromamba@v1
         with:
           environment-file: devtools/conda-envs/test_env.yaml
           environment-name: test
-{%- if cookiecutter.dependency_source == 'Prefer conda-forge with pip fallback' %}
-          condarc: |
-            channels:
-              - conda-forge
-{%- elif cookiecutter.dependency_source == 'Prefer default anaconda channel with pip fallback' %}
-          condarc: |
-            channels:
-              - defaults
-{%- endif %}
-          create-args: >- 
+          channels: conda-forge,defaults
+          extra-specs: |
             python=${{ matrix.python-version }}
-{% endif %}
+
       - name: Install package
-{%- if cookiecutter.dependency_source == 'Dependencies from pip only (no conda)' %}
-        shell: bash
-        run: |
-          python -m pip install .
-{% else %}
         # conda setup requires this special shell
         shell: bash -l {0}
         run: |
           python -m pip install . --no-deps
           micromamba list
-{% endif %}
+
       - name: Run tests
-{%- if cookiecutter.dependency_source == 'Dependencies from pip only (no conda)' %}
-        shell: bash
-{% else %}
         # conda setup requires this special shell
         shell: bash -l {0}
-{%- endif %}
         run: |
           pytest -v --cov=polymerist --cov-report=xml --color=yes polymerist/tests/
 

From 95d2f4c2ee8c232e16647ad8d424a38831522381 Mon Sep 17 00:00:00 2001
From: Timotej Bernat <tibe3324@colorado.edu>
Date: Tue, 13 Aug 2024 12:42:52 -0600
Subject: [PATCH 2/2] Generated 'with condarc' flags based on dummy
 cookiecutter-cms template

---
 .github/workflows/CI.yaml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml
index 3478062..22191c9 100644
--- a/.github/workflows/CI.yaml
+++ b/.github/workflows/CI.yaml
@@ -40,8 +40,11 @@ jobs:
         with:
           environment-file: devtools/conda-envs/test_env.yaml
           environment-name: test
-          channels: conda-forge,defaults
-          extra-specs: |
+          condarc: |
+            channels:
+              - conda-forge
+              - defaults
+          create-args: >- 
             python=${{ matrix.python-version }}
 
       - name: Install package