From b8535c234db0a63a9000cd3f332a4a6cdffeecb4 Mon Sep 17 00:00:00 2001 From: Oscar Branson Date: Tue, 14 Mar 2023 09:34:47 +0000 Subject: [PATCH 1/5] update to 0.4.7 --- HISTORY.rst | 12 ++++++++++++ cbsyst/__init__.py | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/HISTORY.rst b/HISTORY.rst index 317589b..d107f19 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -3,6 +3,18 @@ Release History --------------- +0.4.7 (2023-03-14) +------------ +Updates to work with Kgen 0.2.0. + +0.4.6 (2023-03) +------------ +Fix Omega Units + +0.4.4 (2023-03) +------------ +Fix OmegaC + 0.4.3 (2023-02-07) ------------ Omega calculation. diff --git a/cbsyst/__init__.py b/cbsyst/__init__.py index 4722c43..bf40318 100644 --- a/cbsyst/__init__.py +++ b/cbsyst/__init__.py @@ -2,4 +2,4 @@ from cbsyst.helpers import data_out, Bunch, pH_scale_converter from kgen import calc_Ks -VERSION = '0.4.7-dev' +VERSION = '0.4.7' From cbf2365720b02e7e2debd611fc0d98e8833c5573 Mon Sep 17 00:00:00 2001 From: Oscar Branson Date: Tue, 14 Mar 2023 09:43:39 +0000 Subject: [PATCH 2/5] add breaking change --- HISTORY.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/HISTORY.rst b/HISTORY.rst index d107f19..63117de 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -7,6 +7,10 @@ Release History ------------ Updates to work with Kgen 0.2.0. +**Minor breaking change**: All TX quantities have been renamed to XT (i.e. TF and TS are not FT and ST to be consistent with BT nomenclature) + + + 0.4.6 (2023-03) ------------ Fix Omega Units From ecbbe006904ea970ba4d347e2310ef57b60270e5 Mon Sep 17 00:00:00 2001 From: Oscar Branson Date: Wed, 15 Mar 2023 15:16:49 +0000 Subject: [PATCH 3/5] update minimum kgen version --- cbsyst/__init__.py | 2 +- cbsyst/classes.py | 13 +++++++++++++ setup.cfg | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 cbsyst/classes.py diff --git a/cbsyst/__init__.py b/cbsyst/__init__.py index bf40318..a1c81a4 100644 --- a/cbsyst/__init__.py +++ b/cbsyst/__init__.py @@ -2,4 +2,4 @@ from cbsyst.helpers import data_out, Bunch, pH_scale_converter from kgen import calc_Ks -VERSION = '0.4.7' +VERSION = '0.4.8' diff --git a/cbsyst/classes.py b/cbsyst/classes.py new file mode 100644 index 0000000..ab754d1 --- /dev/null +++ b/cbsyst/classes.py @@ -0,0 +1,13 @@ +class const: + def __init__(self, T, S, P, Mg=None, Ca=None, TS=None, TF=None, TB=None, mode='calculate'): + if TS is None: + TS = calc_TS(S) + if TF is None: + TF = calc_TF(S) + + self.TS = TS + self.TF = TF + self.Mg = Mg + self.Ca = Ca + + self.Ks = calc_Ks(T=T, S=S, P=P, Mg=Mg, Ca=Ca, TS=TS, TF=TF, MyAMI_Mode=mode) \ No newline at end of file diff --git a/setup.cfg b/setup.cfg index 2e48f94..ac6620d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -22,7 +22,7 @@ install_requires = pandas >=0.19 uncertainties >=3.0 tqdm >=4.14 - kgen >=0.0.2 + kgen >=0.2.0 python_requires = >=3.7 packages = find: From fd75c2be901bf46666b4a4fa7a60f17a09505d11 Mon Sep 17 00:00:00 2001 From: Oscar Branson Date: Wed, 15 Mar 2023 15:22:13 +0000 Subject: [PATCH 4/5] update history --- HISTORY.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index 63117de..a826b5f 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -3,14 +3,16 @@ Release History --------------- +0.4.8 (2023-03-15) +------------ +Set minumum required Kgen version to 0.2.0. + 0.4.7 (2023-03-14) ------------ Updates to work with Kgen 0.2.0. **Minor breaking change**: All TX quantities have been renamed to XT (i.e. TF and TS are not FT and ST to be consistent with BT nomenclature) - - 0.4.6 (2023-03) ------------ Fix Omega Units From 3366c3ca29d48b6339808709886843d7acbbfb82 Mon Sep 17 00:00:00 2001 From: rossidae Date: Wed, 2 Aug 2023 15:24:23 +0100 Subject: [PATCH 5/5] Version lock Kgen to known compatible versions until it's stabilised --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b6a7311..7a4469e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,4 +3,4 @@ scipy>=0.18 pandas>=0.19 uncertainties>=3.0 tqdm>=4.14 -kgen>=0.0.2 \ No newline at end of file +kgen>=0.0.2,<=0.2 \ No newline at end of file