Skip to content

Commit

Permalink
Merge pull request #1125 from PolicyEngine/MaxGhenis/issue1123
Browse files Browse the repository at this point in the history
Bump versions and update format
  • Loading branch information
MaxGhenis authored Jan 27, 2024
2 parents 22676eb + 77ea442 commit d7ec70d
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 5 deletions.
5 changes: 5 additions & 0 deletions changelog_entry.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
- bump: patch
changes:
changed:
- Updated code formatting for new black.
- Updated policyengine-us and policyengine-canada.
1 change: 1 addition & 0 deletions policyengine_api/api.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
This is the main Flask app for the PolicyEngine API.
"""

from pathlib import Path
from flask_cors import CORS
import flask
Expand Down
8 changes: 5 additions & 3 deletions policyengine_api/country.py
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,11 @@ def build_variables(self) -> dict:
"moduleName": variable.module_name,
"indexInModule": variable.index_in_module,
"isInputVariable": variable.is_input_variable(),
"defaultValue": variable.default_value
if isinstance(variable.default_value, (int, float, bool))
else None,
"defaultValue": (
variable.default_value
if isinstance(variable.default_value, (int, float, bool))
else None
),
"adds": variable.adds,
"subtracts": variable.subtracts,
"hidden_input": variable.hidden_input,
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
"markupsafe==2.0.1",
"openai",
"PolicyEngine-Core>2.11,<3",
"policyengine_canada==0.87.0",
"policyengine_canada==0.87.1",
"policyengine-ng==0.5.1",
"policyengine-il==0.1.0",
"policyengine_uk==0.63.0",
"policyengine_us==0.632.0",
"policyengine_us==0.633.2",
"pymysql",
"redis",
"rq",
Expand Down
1 change: 1 addition & 0 deletions tests/python/conftest.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Shared fixtures"""

import time
from contextlib import contextmanager
from subprocess import Popen, TimeoutExpired
Expand Down
1 change: 1 addition & 0 deletions tests/python/test_economy_1.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Test basics for /economy endpoints.
"""

import json
import time
import datetime
Expand Down

0 comments on commit d7ec70d

Please sign in to comment.