From 49462ad03056fabc8371a131ad82e7128b193725 Mon Sep 17 00:00:00 2001 From: PavelMakarchuk Date: Tue, 3 Dec 2024 16:36:18 -0500 Subject: [PATCH 1/8] psutil version requirement update --- changelog_entry.yaml | 4 ++++ setup.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changelog_entry.yaml b/changelog_entry.yaml index e69de29bb..e2644f52d 100644 --- a/changelog_entry.yaml +++ b/changelog_entry.yaml @@ -0,0 +1,4 @@ +- bump: patch + changes: + fixed: + - psutil version requirement update. diff --git a/setup.py b/setup.py index 37eae1550..e985125f5 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ "pandas>=1.4.2,<2", "plotly>=5.6.0,<6", "policyengine_core>=3.6.4", - "psutil<6", + "psutil<7", "pytest", "requests>=2.27.1,<3", "sortedcontainers<3", From 9ddcd3489477192d61d4c4030d5269e6d1cf8c1e Mon Sep 17 00:00:00 2001 From: PavelMakarchuk Date: Tue, 3 Dec 2024 16:54:25 -0500 Subject: [PATCH 2/8] core --- changelog_entry.yaml | 2 +- setup.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/changelog_entry.yaml b/changelog_entry.yaml index e2644f52d..d3e15f5a7 100644 --- a/changelog_entry.yaml +++ b/changelog_entry.yaml @@ -1,4 +1,4 @@ - bump: patch changes: fixed: - - psutil version requirement update. + - Core version requirement update. diff --git a/setup.py b/setup.py index e985125f5..b7f32db58 100644 --- a/setup.py +++ b/setup.py @@ -20,8 +20,7 @@ "numexpr<3", "pandas>=1.4.2,<2", "plotly>=5.6.0,<6", - "policyengine_core>=3.6.4", - "psutil<7", + "policyengine_core>=3.14.1", "pytest", "requests>=2.27.1,<3", "sortedcontainers<3", From f348153cc6b890340682b506efc70ebd8ed17b56 Mon Sep 17 00:00:00 2001 From: PavelMakarchuk Date: Tue, 3 Dec 2024 16:57:23 -0500 Subject: [PATCH 3/8] python req. --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index b7f32db58..1cf72baaf 100644 --- a/setup.py +++ b/setup.py @@ -65,8 +65,8 @@ extras_require={ "dev": dev_requirements, }, - # Windows CI requires Python 3.9. - python_requires=">=3.7", + # Windows CI requires Python 3.10. + python_requires=">=3.10", install_requires=general_requirements, packages=find_packages(), include_package_data=True, From 0d20f9842c1f432705bd13a9e4984225b3eefba7 Mon Sep 17 00:00:00 2001 From: PavelMakarchuk Date: Tue, 3 Dec 2024 16:58:44 -0500 Subject: [PATCH 4/8] pyhton req. --- setup.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/setup.py b/setup.py index 1cf72baaf..35564e079 100644 --- a/setup.py +++ b/setup.py @@ -49,9 +49,6 @@ "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", "Topic :: Scientific/Engineering :: Information Analysis", ], @@ -65,9 +62,8 @@ extras_require={ "dev": dev_requirements, }, - # Windows CI requires Python 3.10. python_requires=">=3.10", install_requires=general_requirements, packages=find_packages(), include_package_data=True, -) +) \ No newline at end of file From 48fc72092d46d5ddca5f3bef7d028dc89097b1eb Mon Sep 17 00:00:00 2001 From: PavelMakarchuk Date: Tue, 3 Dec 2024 17:00:44 -0500 Subject: [PATCH 5/8] match us structure --- setup.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index 35564e079..d21efd89f 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,7 +19,6 @@ "numexpr<3", "pandas>=1.4.2,<2", "plotly>=5.6.0,<6", - "policyengine_core>=3.14.1", "pytest", "requests>=2.27.1,<3", "sortedcontainers<3", @@ -50,6 +48,8 @@ "Operating System :: POSIX", "Programming Language :: Python", "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.", @@ -62,7 +62,7 @@ extras_require={ "dev": dev_requirements, }, - python_requires=">=3.10", + python_requires=">=3.10,<3.13", install_requires=general_requirements, packages=find_packages(), include_package_data=True, From 580db6af6dc17dfbe25524023802d432df177cae Mon Sep 17 00:00:00 2001 From: PavelMakarchuk Date: Tue, 3 Dec 2024 17:03:25 -0500 Subject: [PATCH 6/8] update workflow --- .github/workflows/pr.yaml | 4 ++-- .github/workflows/push.yaml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index a9cc00092..34c2a7da5 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.10 - 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.10 - name: Install package run: make install - name: Run tests diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index ac4d68f3d..810c4b27d 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.10 - 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.10 - 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.10 - 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.10 - name: Install Wheel and Pytest run: pip3 install wheel setuptools pytest==5.4.3 - name: Install package From 3be5cc12f10e7d6fbd1812980ad53e5648de7ff9 Mon Sep 17 00:00:00 2001 From: PavelMakarchuk Date: Tue, 3 Dec 2024 17:04:55 -0500 Subject: [PATCH 7/8] 3.12 --- .github/workflows/pr.yaml | 4 ++-- .github/workflows/push.yaml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 34c2a7da5..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.10 + 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.10 + 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 810c4b27d..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.10 + 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.10 + 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.10 + 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.10 + python-version: 3.12 - name: Install Wheel and Pytest run: pip3 install wheel setuptools pytest==5.4.3 - name: Install package From b4febd5afc0ce2f2d9773573906bb49a0d896dec Mon Sep 17 00:00:00 2001 From: PavelMakarchuk Date: Tue, 3 Dec 2024 17:05:46 -0500 Subject: [PATCH 8/8] format --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index d21efd89f..5f25247a2 100644 --- a/setup.py +++ b/setup.py @@ -66,4 +66,4 @@ install_requires=general_requirements, packages=find_packages(), include_package_data=True, -) \ No newline at end of file +)