Skip to content

Commit

Permalink
Merge branch 'release/v0.4.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
wpk committed Jun 16, 2023
2 parents 776f316 + 18daf28 commit 2ee639e
Show file tree
Hide file tree
Showing 46 changed files with 2,321 additions and 796 deletions.
6 changes: 3 additions & 3 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": "10a9fe1a4f0b341184e41953433c344020f92c72",
"checkout": "feature/markdown",
"commit": "49d100c749e6cfa2cba3460ed06e4a06be07cc63",
"checkout": "feature/nox",
"skip": [
"src/thermoextrap/__init__.py",
"docs/examples/usage/demo.ipynb",
Expand All @@ -14,7 +14,7 @@
"email": "[email protected]",
"github_username": "usnistgov",
"pypi_username": "wpk-nist",
"conda_channel": "wpk-nist",
"conda_channel": "conda-forge",
"project_name": "thermoextrap",
"project_slug": "thermoextrap",
"_copy_without_render": [
Expand Down
8 changes: 6 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ pip-delete-this-directory.txt
# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.coverage.*
.cache
Expand Down Expand Up @@ -106,7 +107,10 @@ ENV/
pyrightconfig.json
.autoenv.zsh
.autoenv_leave.zsh
.noxconfig.toml
cruft.patch
/docs/**/generated/
/monkeytype.sqlite3
/dist-conda/*
!/dist-conda/Makefile
/dist-conda/
/tmp/
/thermoextrap-feedstock*/
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ repos:
- id: blacken-docs
additional_dependencies:
- black==23.3.0
exclude: ^README.md
# exclude: ^README.md
- repo: https://github.com/nbQA-dev/nbQA
rev: 1.7.0
hooks:
Expand Down
19 changes: 19 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 `thermoextrap`
Expand All @@ -9,6 +11,23 @@ See the fragment files in

<!-- scriv-insert-here -->

## v0.4.0 — 2023-06-15

### Added

- Package now available on conda-forge

- Now support python3.11
- Bumped pymbar version to pymbar>=4.0

### Changed

- Switched from tox to nox for testing.

### Deprecated

- No longer support pymbar < 4.0

## v0.3.0 — 2023-05-03

### Changed
Expand Down
Loading

0 comments on commit 2ee639e

Please sign in to comment.