From 226d618c5b7b3118fe5e18b7dd2f11596b833853 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Mon, 1 Apr 2024 21:29:44 -0700 Subject: [PATCH 1/2] Drop unused dependencies of PyGitHub PyJWT and PyNaCl are already installed by PyGitHub, which uses them. We don't use them directly here. So drop them from our requirements. --- conda-requirements.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/conda-requirements.txt b/conda-requirements.txt index b1bb13021..a22e4a16c 100644 --- a/conda-requirements.txt +++ b/conda-requirements.txt @@ -12,8 +12,6 @@ lxml mock parameterized pygithub>=2.2.0 # for GH App endpoints -pyjwt -pynacl pytest python=3.10.* pytz From 956d485b54a7d0ffd2d7b19e2970c0156b9bd28c Mon Sep 17 00:00:00 2001 From: jakirkham Date: Mon, 1 Apr 2024 21:29:45 -0700 Subject: [PATCH 2/2] Refactor out test requirements Move requirements just used for testing into a separate requirements file used on CI. This way we don't need to install these in the Heroku container or have them in the webservice, which should lighten up the memory usage on Heroku. --- .github/workflows/clean-and-update.yml | 2 +- .github/workflows/tests.yml | 4 ++-- conda-requirements.txt | 1 - conda-test-requirements.txt | 1 + 4 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 conda-test-requirements.txt diff --git a/.github/workflows/clean-and-update.yml b/.github/workflows/clean-and-update.yml index 68228431d..49fb496ef 100644 --- a/.github/workflows/clean-and-update.yml +++ b/.github/workflows/clean-and-update.yml @@ -32,7 +32,7 @@ jobs: run: | conda config --set show_channel_urls True conda config --add channels conda-forge - conda install --yes --quiet --file conda-requirements.txt + conda install --yes --quiet --file conda-requirements.txt --file conda-test-requirements.txt git config --global user.email "79913779+conda-forge-curator[bot]@users.noreply.github.com" git config --global user.name "conda-forge-curator[bot]" mkdir -p ~/.conda-smithy/ && echo $GH_TOKEN > ~/.conda-smithy/github.token diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2be578dc7..62f923f57 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -35,7 +35,7 @@ jobs: run: | conda config --set show_channel_urls True conda config --add channels conda-forge - conda install --yes --quiet --file conda-requirements.txt + conda install --yes --quiet --file conda-requirements.txt --file conda-test-requirements.txt git config --global user.email "79913779+conda-forge-curator[bot]@users.noreply.github.com" git config --global user.name "conda-forge-curator[bot]" mkdir -p ~/.conda-smithy/ && echo $GH_TOKEN > ~/.conda-smithy/github.token @@ -85,7 +85,7 @@ jobs: run: | conda config --set show_channel_urls True conda config --add channels conda-forge - conda install --yes --quiet --file conda-requirements.txt + conda install --yes --quiet --file conda-requirements.txt --file conda-test-requirements.txt git config --global user.email "79913779+conda-forge-curator[bot]@users.noreply.github.com" git config --global user.name "conda-forge-curator[bot]" git config --global pull.rebase false diff --git a/conda-requirements.txt b/conda-requirements.txt index a22e4a16c..be55c7a17 100644 --- a/conda-requirements.txt +++ b/conda-requirements.txt @@ -12,7 +12,6 @@ lxml mock parameterized pygithub>=2.2.0 # for GH App endpoints -pytest python=3.10.* pytz pyyaml diff --git a/conda-test-requirements.txt b/conda-test-requirements.txt new file mode 100644 index 000000000..e079f8a60 --- /dev/null +++ b/conda-test-requirements.txt @@ -0,0 +1 @@ +pytest