Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/cibuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ defaults:

on:
push:
branches:
- master
pull_request:
Comment on lines +9 to 11
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added pull_request recently, which resulted in duplicated builds. Now restricting push builds to the master branch.

schedule:
- cron: '0 4 1 * *'
Expand Down Expand Up @@ -45,7 +47,6 @@ jobs:
run: |
python -m pip install --upgrade pip
pip install .
make devenv
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unnecessary, all handled by conda environment setup.

- name: Style check
run: |
make style
Expand Down
7 changes: 3 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,8 @@ format:
black --line-length=99 pytaxonkit.py setup.py


## devenv: set up a development environment
devenv:
conda install -y black==22.6.0 pytest pytest-cov
pip install -e .
## hooks: install development hooks
hooks:
echo "set -eo pipefail" > .git/hooks/pre-commit
Comment on lines -26 to +28
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removing some vestigial cruft.

echo 'make style' >> .git/hooks/pre-commit
chmod 755 .git/hooks/pre-commit
2 changes: 1 addition & 1 deletion environment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ channels:
- conda-forge
- defaults
dependencies:
- black==22.6.0
- black>=22.6
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the Python 3.13 compatibility update.

- pandas>=1.0
- python>=3.6
- pytest>=5.4
Expand Down
Loading