From 5127f99848d619f28e23f83434954207fe079376 Mon Sep 17 00:00:00 2001 From: tabedzki <35670232+tabedzki@users.noreply.github.com> Date: Wed, 17 Jul 2024 10:55:39 -0400 Subject: [PATCH 1/5] Bumped minimum version to 3.8 --- requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index c0e8a99c2..65c0c8b6f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ pyparsing ipython pandas tqdm -networkx<=2.6.3 # until py3.8 is our minimum version +networkx pydot minio>=7.0.0 matplotlib diff --git a/setup.py b/setup.py index ecf53d97f..904260681 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ from os import path import sys -min_py_version = (3, 7) +min_py_version = (3, 8) if sys.version_info < min_py_version: sys.exit( From 552a0b49e34e88802623915ee9d385bf24fd1377 Mon Sep 17 00:00:00 2001 From: tabedzki <35670232+tabedzki@users.noreply.github.com> Date: Mon, 29 Jul 2024 10:49:53 -0400 Subject: [PATCH 2/5] Removed test for 3.7 and added one for 3.12 --- .github/workflows/development.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml index bb1f9e179..87eface9f 100644 --- a/.github/workflows/development.yaml +++ b/.github/workflows/development.yaml @@ -58,14 +58,14 @@ jobs: py_ver: ["3.9"] mysql_ver: ["8.0", "5.7"] include: + - py_ver: "3.12" + mysql_ver: "8.0" - py_ver: "3.11" mysql_ver: "8.0" - py_ver: "3.10" mysql_ver: "8.0" - py_ver: "3.8" mysql_ver: "5.7" - - py_ver: "3.7" - mysql_ver: "5.7" steps: - uses: actions/checkout@v3 - name: Set up Python ${{matrix.py_ver}} From ea9c796118e9f2256ed1d32df47c68255dfaf57d Mon Sep 17 00:00:00 2001 From: tabedzki <35670232+tabedzki@users.noreply.github.com> Date: Mon, 29 Jul 2024 10:52:22 -0400 Subject: [PATCH 3/5] Updated changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c22d6e802..a560866ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,9 @@ - Fixed - `Autopopulate.populate` excludes `reserved` jobs in addition to `ignore` and `error` jobs - Fixed - Issue [#1159]((https://github.com/datajoint/datajoint-python/pull/1159) (cascading delete) - PR [#1160](https://github.com/datajoint/datajoint-python/pull/1160) +### 0.14.2 -- July 29, 2024 +- Changed - Minimum Python version for Datajoint-Python is now 3.7 PR #1163 + ### 0.14.1 -- Jun 02, 2023 - Fixed - Fix altering a part table that uses the "master" keyword - PR [#991](https://github.com/datajoint/datajoint-python/pull/991) - Fixed - `.ipynb` output in tutorials is not visible in dark mode ([#1078](https://github.com/datajoint/datajoint-python/issues/1078)) PR [#1080](https://github.com/datajoint/datajoint-python/pull/1080) From ef502773f5bbd9653b4ffbae6339df37bcab343e Mon Sep 17 00:00:00 2001 From: tabedzki <35670232+tabedzki@users.noreply.github.com> Date: Fri, 2 Aug 2024 16:24:37 -0400 Subject: [PATCH 4/5] Remove addition of 3.12 and updated GHA to newer versions --- .github/workflows/development.yaml | 20 +++++++++----------- .github/workflows/docs.yaml | 2 +- CHANGELOG.md | 2 +- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml index 87eface9f..b62f4134e 100644 --- a/.github/workflows/development.yaml +++ b/.github/workflows/development.yaml @@ -28,7 +28,7 @@ jobs: DOCKER_CLIENT_TIMEOUT: "120" COMPOSE_HTTP_TIMEOUT: "120" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Validate version and release notes run: | DJ_VERSION=$(grep -oP '\d+\.\d+\.\d+' datajoint/version.py) @@ -58,8 +58,6 @@ jobs: py_ver: ["3.9"] mysql_ver: ["8.0", "5.7"] include: - - py_ver: "3.12" - mysql_ver: "8.0" - py_ver: "3.11" mysql_ver: "8.0" - py_ver: "3.10" @@ -67,9 +65,9 @@ jobs: - py_ver: "3.8" mysql_ver: "5.7" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{matrix.py_ver}} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{matrix.py_ver}} - name: Install dependencies @@ -96,9 +94,9 @@ jobs: matrix: py_ver: ["3.11"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{matrix.py_ver}} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{matrix.py_ver}} - name: Install dependencies @@ -119,7 +117,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Codespell uses: codespell-project/actions-codespell@v2 publish-docs: @@ -132,7 +130,7 @@ jobs: DOCKER_CLIENT_TIMEOUT: "120" COMPOSE_HTTP_TIMEOUT: "120" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Deploy docs run: | export MODE=BUILD @@ -164,9 +162,9 @@ jobs: outputs: release_upload_url: ${{steps.create_gh_release.outputs.upload_url}} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{matrix.py_ver}} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{matrix.py_ver}} - name: Determine package version diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index cb794b4a0..f5a344445 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -8,7 +8,7 @@ jobs: DOCKER_CLIENT_TIMEOUT: "120" COMPOSE_HTTP_TIMEOUT: "120" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Deploy docs run: | export MODE=BUILD diff --git a/CHANGELOG.md b/CHANGELOG.md index a560866ab..bbfcb834b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ - Fixed - Issue [#1159]((https://github.com/datajoint/datajoint-python/pull/1159) (cascading delete) - PR [#1160](https://github.com/datajoint/datajoint-python/pull/1160) ### 0.14.2 -- July 29, 2024 -- Changed - Minimum Python version for Datajoint-Python is now 3.7 PR #1163 +- Changed - Minimum Python version for Datajoint-Python is now 3.8 PR #1163 ### 0.14.1 -- Jun 02, 2023 - Fixed - Fix altering a part table that uses the "master" keyword - PR [#991](https://github.com/datajoint/datajoint-python/pull/991) From ee0f0dbee2b2391ebf8209f73295004ac807ba3e Mon Sep 17 00:00:00 2001 From: tabedzki <35670232+tabedzki@users.noreply.github.com> Date: Fri, 2 Aug 2024 17:19:51 -0400 Subject: [PATCH 5/5] Updated position of entry in changelog.md --- CHANGELOG.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bbfcb834b..096c3cc9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,8 +12,6 @@ - Changed - Returning success count after the .populate() call - PR [#1050](https://github.com/datajoint/datajoint-python/pull/1050) - Fixed - `Autopopulate.populate` excludes `reserved` jobs in addition to `ignore` and `error` jobs - Fixed - Issue [#1159]((https://github.com/datajoint/datajoint-python/pull/1159) (cascading delete) - PR [#1160](https://github.com/datajoint/datajoint-python/pull/1160) - -### 0.14.2 -- July 29, 2024 - Changed - Minimum Python version for Datajoint-Python is now 3.8 PR #1163 ### 0.14.1 -- Jun 02, 2023