Skip to content

Commit

Permalink
Merge branch 'PolicyEngine:master' into parameternode-274
Browse files Browse the repository at this point in the history
  • Loading branch information
SylviaDu99 authored Nov 23, 2024
2 parents eaceba1 + 9fbe198 commit a38dafa
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 4 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
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).

## [3.12.5] - 2024-11-20 13:13:13

### Changed

- update the psutil requirement to version 6
- update the furo requirment to <2025
- update the markupsafe requirement to <3

## [3.12.4] - 2024-11-11 14:20:12

### Fixed
Expand Down Expand Up @@ -924,6 +932,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0



[3.12.5]: https://github.com/PolicyEngine/policyengine-core/compare/3.12.4...3.12.5
[3.12.4]: https://github.com/PolicyEngine/policyengine-core/compare/3.12.3...3.12.4
[3.12.3]: https://github.com/PolicyEngine/policyengine-core/compare/3.12.2...3.12.3
[3.12.2]: https://github.com/PolicyEngine/policyengine-core/compare/3.12.1...3.12.2
Expand Down
7 changes: 7 additions & 0 deletions changelog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -748,3 +748,10 @@
This prevents other processes attempting to read a partial file or clobbering
each other.
date: 2024-11-11 14:20:12
- bump: patch
changes:
changed:
- update the psutil requirement to version 6
- update the furo requirment to <2025
- update the markupsafe requirement to <3
date: 2024-11-20 13:13:13
8 changes: 4 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"sortedcontainers<3",
"numexpr<3",
"dpath<3",
"psutil<6",
"psutil>=6,<7",
"wheel<1",
"h5py>=3,<4",
"requests>=2,<3",
Expand All @@ -32,8 +32,8 @@
"jupyter-book<1",
"yaml-changelog<1",
"coverage",
"furo<2023",
"markupsafe==2.0.1",
"furo<2025",
"markupsafe<3",
"coverage",
"furo",
"mypy<2",
Expand All @@ -48,7 +48,7 @@

setup(
name="policyengine-core",
version="3.12.4",
version="3.12.5",
author="PolicyEngine",
author_email="[email protected]",
classifiers=[
Expand Down

0 comments on commit a38dafa

Please sign in to comment.