diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index a9cc00092..c92590c6f 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -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 @@ -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 diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index ac4d68f3d..2ed5452ae 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/changelog_entry.yaml b/changelog_entry.yaml index e69de29bb..d3e15f5a7 100644 --- a/changelog_entry.yaml +++ b/changelog_entry.yaml @@ -0,0 +1,4 @@ +- bump: patch + changes: + fixed: + - Core version requirement update. diff --git a/setup.py b/setup.py index 37eae1550..5f25247a2 100644 --- a/setup.py +++ b/setup.py @@ -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", @@ -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", @@ -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.", @@ -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,