merge changes from main

KingsburyLab · Aug 13, 2023 · 1d54676 · 1d54676
1 parent 949c853
commit 1d54676
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,6 +26,12 @@
 - Add pre-commit configuration and lint with `black`
 - Update packaging to use [pyscaffold](https://pyscaffold.org/en/stable/index.html)
 
+## 0.5.2 (2020-04-21)
+
+ - Fix breaking bug introduced by upstream pint change to avogadro_number
+ - Format project with black
+ - Misc. linting and docstring changes
+
 ## 0.5.0 (2018-09-19)
 
 - Implement the effective Pitzer model for improved activity calculations in multicomponent solutions

diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2013-2022 Ryan S. Kingsbury
+Copyright (c) 2013-2023 Ryan S. Kingsbury
 
 pyEQL is free software; you can redistribute it and/or modify it under
 the terms of the GNU Lesser General Public License as published by the