Skip to content

Commit

Permalink
Merge branch 'master' into users-gql
Browse files Browse the repository at this point in the history
* master:
  Always use stdlib importlib.metadata (#3997)
  Better class signatures in docs (#3996)
  Bump tornado from 6.3.3 to 6.4.1 in /lambdas/preview (#3995)
  Bump amazonlinux from 2023.4.20240416.0 to 2023.4.20240528.0 in /catalog (#3991)
  Bump amazonlinux from 2023.4.20240416.0 to 2023.4.20240528.0 in /s3-proxy (#3992)
  Drop Python 3.8 support (#3993)
  • Loading branch information
nl0 committed Jun 11, 2024
2 parents bc98967 + b58a355 commit 7539b21
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 17 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/py-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions api/python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion catalog/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM amazonlinux:2023.4.20240416.0
FROM amazonlinux:2023.4.20240528.0
MAINTAINER Quilt Data, Inc. [email protected]

ENV LC_ALL=C.UTF-8
Expand Down
2 changes: 2 additions & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/api-reference/Bucket.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

# Bucket(self, bucket\_uri) {#Bucket}
# Bucket(bucket\_uri) {#Bucket}
Bucket interface for Quilt.

**\_\_init\_\_**
Expand Down
4 changes: 2 additions & 2 deletions docs/api-reference/Package.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

# Package(self) {#Package}
# Package() {#Package}
In-memory representation of a package

## manifest
Expand Down Expand Up @@ -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\_\_**
Expand Down
10 changes: 3 additions & 7 deletions gendocs/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -41,7 +37,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']
Expand Down Expand Up @@ -75,7 +71,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()

Expand Down
2 changes: 1 addition & 1 deletion lambdas/preview/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion s3-proxy/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM amazonlinux:2023.4.20240416.0
FROM amazonlinux:2023.4.20240528.0
MAINTAINER Quilt Data, Inc. [email protected]

# Based on:
Expand Down

0 comments on commit 7539b21

Please sign in to comment.