From 1f1fbdce09d1da8812e43df9c259aaf3843ade06 Mon Sep 17 00:00:00 2001 From: Nikhil Woodruff Date: Fri, 21 Feb 2025 13:53:30 +0000 Subject: [PATCH 1/2] Fix `pkg_resources` limits Python version to 3.10 #104 --- .github/fetch_version.py | 4 ++-- .github/workflows/any_changes.yaml | 2 +- .github/workflows/code_changes.yaml | 2 +- .github/workflows/publish_package.yaml | 2 +- policyengine/utils/charts.py | 5 +++-- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/fetch_version.py b/.github/fetch_version.py index c8069441..2835c828 100644 --- a/.github/fetch_version.py +++ b/.github/fetch_version.py @@ -1,8 +1,8 @@ def fetch_version(): try: - import pkg_resources + import importlib - version = pkg_resources.get_distribution("policyengine").version + return importlib.import_module("policyengine").__version__ return version except Exception as e: print(f"Error fetching version: {e}") diff --git a/.github/workflows/any_changes.yaml b/.github/workflows/any_changes.yaml index 6bec1fe8..4c0a3166 100644 --- a/.github/workflows/any_changes.yaml +++ b/.github/workflows/any_changes.yaml @@ -19,7 +19,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v2 with: - python-version: '3.10' + python-version: '3.13' - name: Install package run: uv pip install .[dev] --system diff --git a/.github/workflows/code_changes.yaml b/.github/workflows/code_changes.yaml index acd4db3f..8529fd58 100644 --- a/.github/workflows/code_changes.yaml +++ b/.github/workflows/code_changes.yaml @@ -30,7 +30,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v2 with: - python-version: '3.10' + python-version: '3.13' - name: Install package run: uv pip install .[dev] --system diff --git a/.github/workflows/publish_package.yaml b/.github/workflows/publish_package.yaml index 14e1f21f..94170236 100644 --- a/.github/workflows/publish_package.yaml +++ b/.github/workflows/publish_package.yaml @@ -17,7 +17,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v2 with: - python-version: '3.10' + python-version: '3.13' - name: Install package run: uv pip install .[dev] --system diff --git a/policyengine/utils/charts.py b/policyengine/utils/charts.py index 9f624c47..ad830d63 100644 --- a/policyengine/utils/charts.py +++ b/policyengine/utils/charts.py @@ -1,6 +1,5 @@ import plotly.graph_objects as go from IPython.core.display import HTML, display_html -import pkg_resources def add_fonts(): @@ -44,7 +43,9 @@ def add_fonts(): def get_version_number(package): - return pkg_resources.get_distribution(package).version + import importlib + + return importlib.import_module(package).__version__ def format_fig( From ec46d4cd49a0921c7ca827e5663bb3e8946516ae Mon Sep 17 00:00:00 2001 From: Nikhil Woodruff Date: Fri, 21 Feb 2025 13:54:09 +0000 Subject: [PATCH 2/2] `pkg_resources` limits Python version to 3.10 Fixes #104 --- changelog_entry.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changelog_entry.yaml b/changelog_entry.yaml index e69de29b..27ba10c1 100644 --- a/changelog_entry.yaml +++ b/changelog_entry.yaml @@ -0,0 +1,4 @@ +- bump: patch + changes: + fixed: + - Dependency for `pkg_resources`.