Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions changelog_entry.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- bump: patch
changes:
changed:
- Update PolicyEngine US to 1.562.3
7 changes: 4 additions & 3 deletions policyengine_api/constants.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from pathlib import Path
import pkg_resources
from importlib.metadata import distributions
from datetime import datetime

REPO = Path(__file__).parents[1]
Expand All @@ -18,11 +18,12 @@
"policyengine_il",
)
try:
_dist_versions = {d.metadata["Name"]: d.version for d in distributions()}
COUNTRY_PACKAGE_VERSIONS = {
country: pkg_resources.get_distribution(package_name).version
country: _dist_versions.get(package_name.replace("_", "-"), "0.0.0")
for country, package_name in zip(COUNTRIES, COUNTRY_PACKAGE_NAMES)
}
except:
except Exception:
COUNTRY_PACKAGE_VERSIONS = {country: "0.0.0" for country in COUNTRIES}

# Valid region types for each country
Expand Down
8 changes: 4 additions & 4 deletions policyengine_api/country.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
ParameterScaleBracket,
)
from policyengine_core.parameters import get_parameter
import pkg_resources
from importlib.metadata import version as get_package_version
from policyengine_core.model_api import Reform, Enum
from policyengine_core.periods import instant
import dpath
Expand Down Expand Up @@ -60,9 +60,9 @@ def build_metadata(self):
}[self.country_id],
basicInputs=self.tax_benefit_system.basic_inputs,
modelled_policies=self.tax_benefit_system.modelled_policies,
version=pkg_resources.get_distribution(
self.country_package_name
).version,
version=get_package_version(
self.country_package_name.replace("_", "-")
),
)

def build_microsimulation_options(self) -> dict:
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"policyengine-ng==0.5.1",
"policyengine-il==0.1.0",
"policyengine_uk==2.39.0",
"policyengine_us==1.550.1",
"policyengine_us==1.562.3",
"policyengine_core>=3.16.6",
"policyengine>=0.7.0",
"pydantic",
Expand Down
Loading