From e89c02fa766c0f62624828ebd4a6df127778e1f9 Mon Sep 17 00:00:00 2001 From: Sergey Fedoseev Date: Wed, 5 Jun 2024 11:19:33 +0400 Subject: [PATCH 1/6] Drop Python 3.8 support (#3993) --- .github/workflows/py-ci.yml | 2 +- api/python/setup.py | 3 +-- docs/CHANGELOG.md | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/py-ci.yml b/.github/workflows/py-ci.yml index a3467a2da55..b1d36f78cbd 100644 --- a/.github/workflows/py-ci.yml +++ b/.github/workflows/py-ci.yml @@ -82,7 +82,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] + python-version: ['3.9', '3.10', '3.11', '3.12'] runs-on: ${{ matrix.os }} env: QUILT_DISABLE_USAGE_METRICS: true diff --git a/api/python/setup.py b/api/python/setup.py index 7836698666c..62fec130710 100644 --- a/api/python/setup.py +++ b/api/python/setup.py @@ -40,12 +40,11 @@ def run(self): packages=find_packages(exclude=("tests", "tests.*")), description='Quilt: where data comes together', long_description=readme(), - python_requires='>=3.8', + python_requires='>=3.9', classifiers=[ 'Development Status :: 5 - Production/Stable', 'Intended Audience :: Developers', 'Operating System :: OS Independent', - 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11', diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index d76cb3238fc..e3d2fae8745 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -17,6 +17,8 @@ Entries inside each section should be ordered by type: # unreleased - YYYY-MM-DD ## Python API +* [Removed] Drop Python 3.8 support ([#3993](https://github.com/quiltdata/quilt/pull/3993)) + ## CLI ## Catalog, Lambdas From 9cf9f4a3ce3fde3882e23834e204804a825bb295 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 5 Jun 2024 07:20:26 +0000 Subject: [PATCH 2/6] Bump amazonlinux from 2023.4.20240416.0 to 2023.4.20240528.0 in /s3-proxy (#3992) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- s3-proxy/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/s3-proxy/Dockerfile b/s3-proxy/Dockerfile index efe7a8edbb0..af611997a5b 100644 --- a/s3-proxy/Dockerfile +++ b/s3-proxy/Dockerfile @@ -1,4 +1,4 @@ -FROM amazonlinux:2023.4.20240416.0 +FROM amazonlinux:2023.4.20240528.0 MAINTAINER Quilt Data, Inc. contact@quiltdata.io # Based on: From d7a44809c69e33ca627169561e89fd985605e3ef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 5 Jun 2024 11:20:39 +0400 Subject: [PATCH 3/6] Bump amazonlinux from 2023.4.20240416.0 to 2023.4.20240528.0 in /catalog (#3991) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- catalog/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalog/Dockerfile b/catalog/Dockerfile index de2abc7c6b3..e3cd2e97ec9 100644 --- a/catalog/Dockerfile +++ b/catalog/Dockerfile @@ -1,4 +1,4 @@ -FROM amazonlinux:2023.4.20240416.0 +FROM amazonlinux:2023.4.20240528.0 MAINTAINER Quilt Data, Inc. contact@quiltdata.io ENV LC_ALL=C.UTF-8 From 2e9ae0c442b390aec8de34d1ed006adb43d1ceda Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 Jun 2024 13:09:02 +0400 Subject: [PATCH 4/6] Bump tornado from 6.3.3 to 6.4.1 in /lambdas/preview (#3995) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- lambdas/preview/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lambdas/preview/requirements.txt b/lambdas/preview/requirements.txt index d1450df5fcf..8a900f5ae2b 100644 --- a/lambdas/preview/requirements.txt +++ b/lambdas/preview/requirements.txt @@ -41,7 +41,7 @@ six==1.12.0 soupsieve==2.4.1 testpath==0.4.2 tinycss2==1.2.1 -tornado==6.3.3 +tornado==6.4.1 traitlets==5.3.0 typing_extensions==4.5.0 urllib3==1.26.18 From 64e081cd71f2b17688780ef8f36304280317edc4 Mon Sep 17 00:00:00 2001 From: Sergey Fedoseev Date: Fri, 7 Jun 2024 13:57:51 +0400 Subject: [PATCH 5/6] Better class signatures in docs (#3996) --- .github/workflows/py-ci.yml | 2 +- docs/api-reference/Bucket.md | 2 +- docs/api-reference/Package.md | 4 ++-- gendocs/build.py | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/py-ci.yml b/.github/workflows/py-ci.yml index b1d36f78cbd..2078d525415 100644 --- a/.github/workflows/py-ci.yml +++ b/.github/workflows/py-ci.yml @@ -54,7 +54,7 @@ jobs: - name: install deps run: | python -m pip install --upgrade pip setuptools - python -m pip install api/python nbconvert git+https://github.com/quiltdata/pydoc-markdown.git@quilt + python -m pip install api/python nbconvert git+https://github.com/quiltdata/pydoc-markdown.git@v2.0.5+quilt3.2 - name: generate docs run: cd gendocs && python build.py - name: show invisible changes via cat diff --git a/docs/api-reference/Bucket.md b/docs/api-reference/Bucket.md index e2b541afff9..7570078cc3a 100644 --- a/docs/api-reference/Bucket.md +++ b/docs/api-reference/Bucket.md @@ -1,5 +1,5 @@ -# Bucket(self, bucket\_uri) {#Bucket} +# Bucket(bucket\_uri) {#Bucket} Bucket interface for Quilt. **\_\_init\_\_** diff --git a/docs/api-reference/Package.md b/docs/api-reference/Package.md index f3b023e165d..647c0ff361e 100644 --- a/docs/api-reference/Package.md +++ b/docs/api-reference/Package.md @@ -1,5 +1,5 @@ -# Package(self) {#Package} +# Package() {#Package} In-memory representation of a package ## manifest @@ -400,7 +400,7 @@ __Returns__ True if the package matches the directory; False otherwise. -# PackageEntry(self, physical\_key, size, hash\_obj, meta) {#PackageEntry} +# PackageEntry(physical\_key, size, hash\_obj, meta) {#PackageEntry} Represents an entry at a logical key inside a package. **\_\_init\_\_** diff --git a/gendocs/build.py b/gendocs/build.py index a9bce7ca5d4..0f1c2dbdef5 100755 --- a/gendocs/build.py +++ b/gendocs/build.py @@ -41,7 +41,7 @@ def install_pydocmd(): except metadata.PackageNotFoundError: version = None - if version and version.endswith(EXPECTED_VERSION_SUFFIX): + if version and EXPECTED_VERSION_SUFFIX in version: return valid_input = ['y', 'n', 'yes', 'no'] @@ -75,7 +75,7 @@ def install_pydocmd(): import pydocmd - if not pydocmd.__version__.endswith(EXPECTED_VERSION_SUFFIX): + if EXPECTED_VERSION_SUFFIX not in pydocmd.__version__: print("Please re-run this script to continue") exit() From b58a355787fd49019ca3728ecaff3e5e7318324c Mon Sep 17 00:00:00 2001 From: Sergey Fedoseev Date: Fri, 7 Jun 2024 14:54:40 +0400 Subject: [PATCH 6/6] Always use stdlib importlib.metadata (#3997) --- gendocs/build.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/gendocs/build.py b/gendocs/build.py index 0f1c2dbdef5..a0a2c560d3a 100755 --- a/gendocs/build.py +++ b/gendocs/build.py @@ -2,11 +2,7 @@ import subprocess import sys - -try: - from importlib import metadata -except ImportError: - import importlib_metadata as metadata +from importlib import metadata try: from pip._internal import main as pipmain