Skip to content

Commit

Permalink
Ensure we don't revert to adding conda default channel, add setuptool…
Browse files Browse the repository at this point in the history
…s as bootstrap requirement (apparently not included by default on py3.13)
  • Loading branch information
chrisjbillington committed Nov 27, 2024
1 parent 0245665 commit 3b2b56b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .github/workflows/build-and-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ jobs:
python-version: ${{ matrix.python }}
architecture: ${{ matrix.arch }}
miniforge-version: "latest"
channels: conda-forge
conda-remove-defaults: "true"

- name: Conda package (Unix)
if: runner.os != 'Windows'
Expand Down
2 changes: 1 addition & 1 deletion setuptools_conda/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ def remove_projects(requirements, projects):

# Bootstrap up our own requirements just to run the functions for getting
# requirements:
need = ["toml", "distlib"]
need = ["setuptools", "toml", "distlib"]
for name in need[:]:
try:
__import__(name)
Expand Down

0 comments on commit 3b2b56b

Please sign in to comment.