Skip to content

Commit

Permalink
depend on setuptools (#152)
Browse files Browse the repository at this point in the history
* depend on setuptools

* changelog
  • Loading branch information
AlbertDeFusco authored Feb 9, 2024
1 parent 83a4a57 commit c494a31
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 5 deletions.
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
# Changelog

## [0.3.1] - 2024-02-28
## [0.3.2] - 2024-02-09

### Fixes

- Depend on setuptools [#152](https://github.com/conda-incubator/conda-project/pull/152)

## [0.3.1] - 2024-02-08

### Fixes

Expand Down
5 changes: 3 additions & 2 deletions conda.recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,14 @@ requirements:
- python-dotenv
- fsspec
- python-libarchive-c
- setuptools

test:
imports:
- conda_project
commands:
# conda-project --help
# conda-project --version
- conda-project --help
- conda-project --version
- python -c "from conda_project import __version__; assert __version__ == \"{{ version }}\""

about:
Expand Down
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ dependencies = [
"shellingham",
"python-dotenv",
"fsspec",
"libarchive-c"
"libarchive-c",
"setuptools"
]

[tool.hatch.version]
Expand Down
1 change: 0 additions & 1 deletion src/conda_project/project_file.py
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,6 @@ def add_dependencies(
_, dep = dep.split("::", maxsplit=1)
name = Requirement(dep).name
if name in current_pip_names:
# self._pip_requirements[current_pip_names.index(name)] = dep
self._replace_pip_requirement(current_pip_names.index(name), dep)
else:
pip_to_add.append(dep)
Expand Down

0 comments on commit c494a31

Please sign in to comment.