Skip to content

Commit

Permalink
Merge pull request #501 from PolicyEngine/ps_util
Browse files Browse the repository at this point in the history
psutil version requirement update
  • Loading branch information
MaxGhenis authored Dec 3, 2024
2 parents 631cad3 + b4febd5 commit 789085f
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 16 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.9
python-version: 3.12
- name: Build changelog
run: pip install yaml-changelog==0.3.0 && make changelog
- name: Preview changelog update
Expand All @@ -41,7 +41,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.9
python-version: 3.12
- name: Install package
run: make install
- name: Run tests
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: 3.9
python-version: 3.12
- name: Build changelog
run: pip install yaml-changelog==0.3.0 && make changelog
- name: Preview changelog update
Expand All @@ -56,7 +56,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.9
python-version: 3.12
- name: Install package
run: make install
- name: Run tests
Expand All @@ -82,7 +82,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: 3.9
python-version: 3.12
- name: Publish a git tag
run: ".github/publish-git-tag.sh || true"
- name: Install package
Expand Down Expand Up @@ -112,7 +112,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v2
with:
python-version: 3.9
python-version: 3.12
- name: Install Wheel and Pytest
run: pip3 install wheel setuptools pytest==5.4.3
- name: Install package
Expand Down
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:
fixed:
- Core version requirement update.
15 changes: 5 additions & 10 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@
this_directory = Path(__file__).parent
long_description = (this_directory / "README.md").read_text()

# Please make sure to cap all dependency versions, in order to avoid unwanted
# functional and integration breaks caused by external code updates.

# Core requirements with refined version constraints
general_requirements = [
"policyengine_core>=3.14.1",
"black[jupyter]",
"coverage<7",
"dpath<3",
Expand All @@ -20,8 +19,6 @@
"numexpr<3",
"pandas>=1.4.2,<2",
"plotly>=5.6.0,<6",
"policyengine_core>=3.6.4",
"psutil<6",
"pytest",
"requests>=2.27.1,<3",
"sortedcontainers<3",
Expand Down Expand Up @@ -50,10 +47,9 @@
"License :: OSI Approved :: GNU Affero General Public License v3",
"Operating System :: POSIX",
"Programming Language :: Python",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Topic :: Scientific/Engineering :: Information Analysis",
],
description="Microsimulation model for Canada's tax-benefit system.",
Expand All @@ -66,8 +62,7 @@
extras_require={
"dev": dev_requirements,
},
# Windows CI requires Python 3.9.
python_requires=">=3.7",
python_requires=">=3.10,<3.13",
install_requires=general_requirements,
packages=find_packages(),
include_package_data=True,
Expand Down

0 comments on commit 789085f

Please sign in to comment.