From 1c493883e3f45d0aef364467b92ed85a67add1b2 Mon Sep 17 00:00:00 2001 From: jdebacker Date: Sat, 23 Nov 2024 19:25:52 -0500 Subject: [PATCH 1/9] bump version --- paramtools/__init__.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/paramtools/__init__.py b/paramtools/__init__.py index 3df4769..292fa9f 100644 --- a/paramtools/__init__.py +++ b/paramtools/__init__.py @@ -53,7 +53,7 @@ name = "paramtools" -__version__ = "0.18.3" +__version__ = "0.19.0" __all__ = [ "SchemaFactory", diff --git a/setup.py b/setup.py index e6c1ced..4cbb390 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ setuptools.setup( name="paramtools", - version=os.environ.get("VERSION", "0.18.3"), + version=os.environ.get("VERSION", "0.19.0"), author="Hank Doupe", author_email="henrymdoupe@gmail.com", description=( From 45f025b2def631b649c8d84aca13261d5ee882c6 Mon Sep 17 00:00:00 2001 From: jdebacker Date: Sat, 23 Nov 2024 19:45:33 -0500 Subject: [PATCH 2/9] change format of exception string for new numpy --- paramtools/tests/test_parameters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paramtools/tests/test_parameters.py b/paramtools/tests/test_parameters.py index 1c5a6ec..6a25693 100644 --- a/paramtools/tests/test_parameters.py +++ b/paramtools/tests/test_parameters.py @@ -1047,7 +1047,7 @@ def test_range_validation_on_list_param(self, TestParams): ] } params.adjust(adj, raise_errors=False) - exp = ["float_list_param[label0=zero, label1=1] [np.float64(-1.0), np.float64(1.0)] < min 0 "] + exp = ["float_list_param[label0=zero, label1=1] [-1.0, 1.0] < min 0 "] assert params.errors["float_list_param"] == exp From 8d8817c79b2ee6de77cdb0080bf7b87c8ac337b9 Mon Sep 17 00:00:00 2001 From: jdebacker Date: Sat, 23 Nov 2024 19:53:18 -0500 Subject: [PATCH 3/9] remove gcp test as resource not there --- paramtools/tests/test_utils.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/paramtools/tests/test_utils.py b/paramtools/tests/test_utils.py index c0b8d27..987e55f 100644 --- a/paramtools/tests/test_utils.py +++ b/paramtools/tests/test_utils.py @@ -19,10 +19,10 @@ def test_read_s3(self): res = read_json("s3://paramtools-test/defaults.json", {"anon": True}) assert isinstance(res, dict) - @pytest.mark.network_bound - def test_read_gcp(self): - res = read_json("gs://paramtools-dev/defaults.json", {"token": "anon"}) - assert isinstance(res, dict) + # @pytest.mark.network_bound + # def test_read_gcp(self): + # res = read_json("gs://paramtools-dev/defaults.json", {"token": "anon"}) + # assert isinstance(res, dict) @pytest.mark.network_bound def test_read_http(self): From 01e50894a80b107aa21ea19142261016c8bd4712 Mon Sep 17 00:00:00 2001 From: jdebacker Date: Sat, 23 Nov 2024 19:54:16 -0500 Subject: [PATCH 4/9] add back --- paramtools/tests/test_utils.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/paramtools/tests/test_utils.py b/paramtools/tests/test_utils.py index 987e55f..c0b8d27 100644 --- a/paramtools/tests/test_utils.py +++ b/paramtools/tests/test_utils.py @@ -19,10 +19,10 @@ def test_read_s3(self): res = read_json("s3://paramtools-test/defaults.json", {"anon": True}) assert isinstance(res, dict) - # @pytest.mark.network_bound - # def test_read_gcp(self): - # res = read_json("gs://paramtools-dev/defaults.json", {"token": "anon"}) - # assert isinstance(res, dict) + @pytest.mark.network_bound + def test_read_gcp(self): + res = read_json("gs://paramtools-dev/defaults.json", {"token": "anon"}) + assert isinstance(res, dict) @pytest.mark.network_bound def test_read_http(self): From 1bdf1fa6f2d9a2e735cbaac14fb9a09b6ce95707 Mon Sep 17 00:00:00 2001 From: jdebacker Date: Mon, 25 Nov 2024 19:49:43 -0500 Subject: [PATCH 5/9] comment out gcp test as file has been removed --- paramtools/tests/test_utils.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/paramtools/tests/test_utils.py b/paramtools/tests/test_utils.py index c0b8d27..987e55f 100644 --- a/paramtools/tests/test_utils.py +++ b/paramtools/tests/test_utils.py @@ -19,10 +19,10 @@ def test_read_s3(self): res = read_json("s3://paramtools-test/defaults.json", {"anon": True}) assert isinstance(res, dict) - @pytest.mark.network_bound - def test_read_gcp(self): - res = read_json("gs://paramtools-dev/defaults.json", {"token": "anon"}) - assert isinstance(res, dict) + # @pytest.mark.network_bound + # def test_read_gcp(self): + # res = read_json("gs://paramtools-dev/defaults.json", {"token": "anon"}) + # assert isinstance(res, dict) @pytest.mark.network_bound def test_read_http(self): From 62e424dc18f08852df4a50a359ae0840fcde8265 Mon Sep 17 00:00:00 2001 From: jdebacker Date: Wed, 27 Nov 2024 17:56:42 -0500 Subject: [PATCH 6/9] no test on 3.10 --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9bbc66a..76dd95c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,5 +1,5 @@ -name: Build Package and Test Source Code [Python 3.10, 3.11, 3.12] +name: Build Package and Test Source Code [Python 3.11, 3.12] on: push: @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.10", "3.11", "3.12"] + python-version: ["3.11", "3.12"] steps: - name: Checkout From a416698e20f37ce5fc8014bda6a9da0ebcb60a61 Mon Sep 17 00:00:00 2001 From: jdebacker Date: Wed, 27 Nov 2024 18:00:10 -0500 Subject: [PATCH 7/9] change format of float for tests --- .github/workflows/test.yml | 4 ++-- paramtools/tests/test_parameters.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 76dd95c..9bbc66a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,5 +1,5 @@ -name: Build Package and Test Source Code [Python 3.11, 3.12] +name: Build Package and Test Source Code [Python 3.10, 3.11, 3.12] on: push: @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.11", "3.12"] + python-version: ["3.10", "3.11", "3.12"] steps: - name: Checkout diff --git a/paramtools/tests/test_parameters.py b/paramtools/tests/test_parameters.py index 6a25693..1c5a6ec 100644 --- a/paramtools/tests/test_parameters.py +++ b/paramtools/tests/test_parameters.py @@ -1047,7 +1047,7 @@ def test_range_validation_on_list_param(self, TestParams): ] } params.adjust(adj, raise_errors=False) - exp = ["float_list_param[label0=zero, label1=1] [-1.0, 1.0] < min 0 "] + exp = ["float_list_param[label0=zero, label1=1] [np.float64(-1.0), np.float64(1.0)] < min 0 "] assert params.errors["float_list_param"] == exp From c406112188c339f133cec4b2b166aae5be20b90f Mon Sep 17 00:00:00 2001 From: jdebacker Date: Wed, 27 Nov 2024 18:09:39 -0500 Subject: [PATCH 8/9] try to install depend --- environment.yml | 1 + paramtools/tests/test_parameters.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index dacd492..7903a13 100644 --- a/environment.yml +++ b/environment.yml @@ -8,6 +8,7 @@ dependencies: - "pytest>=6.0.0" - pandas - fsspec + - pyopenssl - s3fs # required for tests but not most usage. - gcsfs # required for tests but not most usage. - requests # required for tests but not most usage. diff --git a/paramtools/tests/test_parameters.py b/paramtools/tests/test_parameters.py index 1c5a6ec..6a25693 100644 --- a/paramtools/tests/test_parameters.py +++ b/paramtools/tests/test_parameters.py @@ -1047,7 +1047,7 @@ def test_range_validation_on_list_param(self, TestParams): ] } params.adjust(adj, raise_errors=False) - exp = ["float_list_param[label0=zero, label1=1] [np.float64(-1.0), np.float64(1.0)] < min 0 "] + exp = ["float_list_param[label0=zero, label1=1] [-1.0, 1.0] < min 0 "] assert params.errors["float_list_param"] == exp From 5e82444e9edc069106653bb7b6358897865cae90 Mon Sep 17 00:00:00 2001 From: jdebacker Date: Thu, 28 Nov 2024 09:44:27 -0500 Subject: [PATCH 9/9] change format --- paramtools/tests/test_parameters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paramtools/tests/test_parameters.py b/paramtools/tests/test_parameters.py index 6a25693..1c5a6ec 100644 --- a/paramtools/tests/test_parameters.py +++ b/paramtools/tests/test_parameters.py @@ -1047,7 +1047,7 @@ def test_range_validation_on_list_param(self, TestParams): ] } params.adjust(adj, raise_errors=False) - exp = ["float_list_param[label0=zero, label1=1] [-1.0, 1.0] < min 0 "] + exp = ["float_list_param[label0=zero, label1=1] [np.float64(-1.0), np.float64(1.0)] < min 0 "] assert params.errors["float_list_param"] == exp