From dc7bc17079774baad1a3136b17367af1c6ccd1fd Mon Sep 17 00:00:00 2001 From: Garrett Michael Flynn Date: Tue, 7 May 2024 09:02:19 -0700 Subject: [PATCH] Update Mac environment files to use human-readable label --- .github/workflows/Build-and-deploy-mac.yml | 2 +- .github/workflows/pyflask-build-and-dist-tests.yml | 4 ++-- .github/workflows/testing-live-services.yml | 4 ++-- .github/workflows/testing.yml | 4 ++-- docs/developer_guide.rst | 4 ++-- .../{environment-MAC-arm64.yml => environment-MAC-apple.yml} | 0 .../{environment-MAC.yml => environment-MAC-intel.yml} | 0 7 files changed, 9 insertions(+), 9 deletions(-) rename environments/{environment-MAC-arm64.yml => environment-MAC-apple.yml} (100%) rename environments/{environment-MAC.yml => environment-MAC-intel.yml} (100%) diff --git a/.github/workflows/Build-and-deploy-mac.yml b/.github/workflows/Build-and-deploy-mac.yml index 31b72078b..4412fb78a 100644 --- a/.github/workflows/Build-and-deploy-mac.yml +++ b/.github/workflows/Build-and-deploy-mac.yml @@ -23,7 +23,7 @@ jobs: - uses: conda-incubator/setup-miniconda@v2 with: activate-environment: nwb-guide - environment-file: environments/environment-MAC-arm64.yml + environment-file: environments/environment-MAC-apple.yml auto-activate-base: false - uses: actions/setup-node@v3 diff --git a/.github/workflows/pyflask-build-and-dist-tests.yml b/.github/workflows/pyflask-build-and-dist-tests.yml index bbf9e4f93..a1869f851 100644 --- a/.github/workflows/pyflask-build-and-dist-tests.yml +++ b/.github/workflows/pyflask-build-and-dist-tests.yml @@ -33,12 +33,12 @@ jobs: - python-version: "3.9" os: macos-latest # Mac arm64 runner - label: environments/environment-MAC-arm64.yml + label: environments/environment-MAC-apple.yml prefix: /Users/runner/miniconda3/envs/nwb-guide - python-version: "3.9" os: macos-13 # Mac x64 runner - label: environments/environment-MAC.yml + label: environments/environment-MAC-intel.yml prefix: /Users/runner/miniconda3/envs/nwb-guide - python-version: "3.9" diff --git a/.github/workflows/testing-live-services.yml b/.github/workflows/testing-live-services.yml index 975c7478e..b806197de 100644 --- a/.github/workflows/testing-live-services.yml +++ b/.github/workflows/testing-live-services.yml @@ -28,10 +28,10 @@ jobs: label: environments/environment-Linux.yml - os: macos-latest # Mac arm64 runner - label: environments/environment-MAC-arm64.yml + label: environments/environment-MAC-apple.yml - os: macos-13 # Mac x64 runner - label: environments/environment-MAC.yml + label: environments/environment-MAC-intel.yml - os: windows-latest label: environments/environment-Windows.yml diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 9d22c5c28..80448bb1b 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -28,10 +28,10 @@ jobs: label: environments/environment-Linux.yml - os: macos-latest # Mac arm64 runner - label: environments/environment-MAC-arm64.yml + label: environments/environment-MAC-apple.yml - os: macos-13 # Mac x64 runner - label: environments/environment-MAC.yml + label: environments/environment-MAC-intel.yml - os: windows-latest label: environments/environment-Windows.yml diff --git a/docs/developer_guide.rst b/docs/developer_guide.rst index 1fabc5dd3..3cea310c7 100644 --- a/docs/developer_guide.rst +++ b/docs/developer_guide.rst @@ -36,13 +36,13 @@ Install the appropriate Python dependencies for your operating system. .. code-block:: bash - conda env create -f ./environments/environment-MAC.yml + conda env create -f ./environments/environment-MAC-intel.yml **Mac with arm64 architecture** .. code-block:: bash - conda env create -f ./environments/environment-MAC-arm64.yml + conda env create -f ./environments/environment-MAC-apple.yml **Linux** diff --git a/environments/environment-MAC-arm64.yml b/environments/environment-MAC-apple.yml similarity index 100% rename from environments/environment-MAC-arm64.yml rename to environments/environment-MAC-apple.yml diff --git a/environments/environment-MAC.yml b/environments/environment-MAC-intel.yml similarity index 100% rename from environments/environment-MAC.yml rename to environments/environment-MAC-intel.yml