Skip to content

Commit

Permalink
Merge branch 'release/v0.5.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
wpk committed Sep 9, 2023
2 parents 1305675 + 5bb067c commit eb87916
Show file tree
Hide file tree
Showing 69 changed files with 4,092 additions and 786 deletions.
4 changes: 2 additions & 2 deletions .cruft.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"template": "https://github.com/wpk-nist-gov/cookiecutter-pypackage.git",
"commit": "a0209ae199aa6f953364fc929e50d41d58082173",
"checkout": "feature/markdown",
"commit": "33236949f71e1d4dad788b8e98fa07716799825e",
"checkout": "feature/nox",
"context": {
"cookiecutter": {
"full_name": "William P. Krekelberg",
Expand Down
4 changes: 0 additions & 4 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,3 @@ trim_trailing_whitespace = false
indent_size = 2
max_line_length = 80
trim_trailing_whitespace = false


[*.toml]
indent_size = 4
12 changes: 9 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ pip-delete-this-directory.txt
# Unit test / coverage reports
htmlcov/
.tox/
.nox/
envs/
.coverage
.coverage.*
.cache
Expand Down Expand Up @@ -106,9 +108,13 @@ ENV/
pyrightconfig.json
.autoenv.zsh
.autoenv_leave.zsh
config/userconfig.toml
cruft.patch
/docs/**/generated/
/monkeytype.sqlite3
/dist-conda/*
!/dist-conda/Makefile
/dist-conda/
/tmp/
/pyproject2conda-feedstock*/
/tmp/*
/src/**/_version.py
tuna-loadtime.log
/environment/py*-dev.yaml
21 changes: 11 additions & 10 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,36 +21,37 @@ repos:
- id: check-toml
#* Formatting
- repo: https://github.com/pre-commit/mirrors-prettier
rev: "v3.0.0-alpha.6"
rev: "v3.0.3"
hooks:
- id: prettier
stages: [commit]
additional_dependencies:
- prettier-plugin-toml
exclude: ^environment/lock/.*[.]yaml
#** markdown
- repo: https://github.com/DavidAnson/markdownlint-cli2
rev: v0.6.0
rev: v0.9.2
hooks:
- id: markdownlint-cli2
args: ["--style prettier"]
#* Linting
- repo: https://github.com/charliermarsh/ruff-pre-commit
# Ruff version.
rev: "v0.0.261"
rev: "v0.0.287"
hooks:
- id: ruff
- repo: https://github.com/psf/black
rev: 23.3.0
rev: 23.9.0
hooks:
# - id: black-jupyter
# Move to just black. use nbqa for notebook formatting
- id: black
- repo: https://github.com/adamchainz/blacken-docs
rev: "1.13.0"
rev: "1.16.0"
hooks:
- id: blacken-docs
additional_dependencies:
- black==23.3.0
- black==23.9.0
# exclude: ^README.md
- repo: https://github.com/nbQA-dev/nbQA
rev: 1.7.0
Expand All @@ -62,7 +63,7 @@ repos:

#* Commit message
- repo: https://github.com/commitizen-tools/commitizen
rev: v3.0.1
rev: 3.8.1
hooks:
- id: commitizen
stages: [commit-msg]
Expand Down Expand Up @@ -97,13 +98,13 @@ repos:
- id: isort
stages: [manual]
- repo: https://github.com/asottile/pyupgrade
rev: v3.3.1
rev: v3.10.1
hooks:
- id: pyupgrade
stages: [manual]
args: [--py38-plus]
- repo: https://github.com/pycqa/flake8
rev: 6.0.0
rev: 6.1.0
hooks:
- id: flake8
stages: [manual]
Expand All @@ -125,7 +126,7 @@ repos:
stages: [manual]
#** spelling
- repo: https://github.com/codespell-project/codespell
rev: v2.2.4
rev: v2.2.5
hooks:
- id: codespell
types_or: [python, rst, markdown, cython, c]
Expand Down
2 changes: 1 addition & 1 deletion AUTHORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Development Lead

- William P. Krekelberg \<[email protected]>
- William P. Krekelberg <[email protected]>

## Contributors

Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<!-- markdownlint-disable MD024 -->

# Changelog

Changelog for `pyproject2conda`
Expand Down
Loading

0 comments on commit eb87916

Please sign in to comment.