Skip to content

Commit

Permalink
Merge branch 'more-setuptools' into 'dev'
Browse files Browse the repository at this point in the history
Apply setuptools liberally

See merge request epi2melabs/ezcharts!212
  • Loading branch information
SamStudio8 committed Dec 17, 2024
2 parents 23da07c + 388bfa0 commit 5461a85
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
5 changes: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [v0.11.4]
This version fixes our conda package distribution and has no functional change from v0.11.3.
### Fixed
- Added setuptools to conda requirements.
- Added setuptools to conda package requirements to unbreak package distribution.
### Added
- Added setuptools to python package requirements as it is required for runtime use of pkg_resources.

## [v0.11.3]
### Fixed
Expand Down
1 change: 1 addition & 0 deletions conda/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ requirements:
- pysam
- pymsaviz==0.4.2
- biopython
- setuptools # required for runtime use of pkg_resources

test:
imports:
Expand Down
4 changes: 3 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,6 @@ sigfig
natsort==8.4.0
pysam
pymsaviz==0.4.2
biopython
biopython
# required for runtime use of pkg_resources
setuptools

0 comments on commit 5461a85

Please sign in to comment.