From 3bce103f5a002b08085c2a09f8ce0603ed2163c5 Mon Sep 17 00:00:00 2001 From: forsyth2 <30700190+forsyth2@users.noreply.github.com> Date: Wed, 14 Jun 2023 16:32:18 -0700 Subject: [PATCH] Change workflow to mamba (#429) * Change workflow to mamba --- .github/workflows/build_workflow.yml | 7 +++++-- .github/workflows/release_workflow.yml | 3 +-- conda/dev.yml | 3 +-- setup.py | 1 - 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build_workflow.yml b/.github/workflows/build_workflow.yml index 76e6c48a..121b3a61 100644 --- a/.github/workflows/build_workflow.yml +++ b/.github/workflows/build_workflow.yml @@ -64,6 +64,10 @@ jobs: uses: conda-incubator/setup-miniconda@v2 with: activate-environment: zppy_dev + miniforge-variant: Mambaforge + miniforge-version: latest + use-mamba: true + mamba-version: "*" environment-file: conda/dev.yml channel-priority: strict auto-update-conda: true @@ -117,8 +121,7 @@ jobs: # Using pip for Sphinx dependencies because it takes too long to reproduce a conda environment (~10 secs vs. 3-4 mins) - name: Install Dependencies run: | - python -m pip install --upgrade pip - pip install sphinx==5.2.3 sphinx_rtd_theme==1.0.0 sphinx-multiversion==0.2.4 docutils==0.16 + mamba install -y sphinx==5.2.3 sphinx_rtd_theme==1.0.0 sphinx-multiversion==0.2.4 docutils==0.16 - name: Build Sphinx Docs run: | cd docs diff --git a/.github/workflows/release_workflow.yml b/.github/workflows/release_workflow.yml index 1102578e..9c05750f 100644 --- a/.github/workflows/release_workflow.yml +++ b/.github/workflows/release_workflow.yml @@ -37,8 +37,7 @@ jobs: # Using pip for Sphinx dependencies because it takes too long to reproduce a conda environment (~10 secs vs. 3-4 mins) - name: Install Dependencies run: | - python -m pip install --upgrade pip - pip install sphinx==5.2.3 sphinx_rtd_theme==1.0.0 sphinx-multiversion==0.2.4 docutils==0.16 + mamba install -y sphinx==5.2.3 sphinx_rtd_theme==1.0.0 sphinx-multiversion==0.2.4 docutils==0.16 - name: Build Sphinx Docs run: | diff --git a/conda/dev.yml b/conda/dev.yml index 883f10e1..40281e0d 100644 --- a/conda/dev.yml +++ b/conda/dev.yml @@ -27,9 +27,8 @@ dependencies: # ================= - sphinx=5.2.3 - sphinx_rtd_theme=1.0.0 + - sphinx-multiversion==0.2.4 # Need to pin docutils because 0.17 has a bug with unordered lists # https://github.com/readthedocs/sphinx_rtd_theme/issues/1115 - docutils=0.16 - - pip: - - sphinx-multiversion==0.2.4 prefix: /opt/miniconda3/envs/zppy_dev diff --git a/setup.py b/setup.py index bb5feb92..be1f9279 100644 --- a/setup.py +++ b/setup.py @@ -28,7 +28,6 @@ def package_files(directory, prefixes, extensions): author_email="forsyth2@llnl.gov, golaz1@llnl.gov", description="Post-processing software for E3SM", python_requires=">=3.6", - intall_requires=["configobj>=5.0.0,<6.0.0", "jinja2>=2.0.0"], packages=find_packages(include=["zppy", "zppy.*"]), package_data={"": data_files}, entry_points={"console_scripts": ["zppy=zppy.__main__:main"]},