From 63545132562366279138d28eaad021026ae0e8b7 Mon Sep 17 00:00:00 2001 From: Bruce Martin Date: Thu, 1 Feb 2024 10:01:58 -0800 Subject: [PATCH] [misc] update package dependencies (#965) * update pre-commit versions * update package with security notice * reformatting due to pre-commit (ruff) update * reformatting due to pre-commit (ruff) update * revert broken black version * back out bad reformatting --- .markdownlint.yaml | 3 +-- .pre-commit-config.yaml | 4 ++-- api/python/cellxgene_census/tests/test_acceptance.py | 1 + api/python/cellxgene_census/tests/test_lts_compat.py | 1 + tools/cellxgene_census_builder/pyproject.toml | 2 +- .../src/cellxgene_census_builder/build_state.py | 1 + .../src/cellxgene_census_builder/release_manifest.py | 1 + tools/census_contrib/src/census_contrib/validate.py | 1 + 8 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.markdownlint.yaml b/.markdownlint.yaml index 5007c3dad..dc2e4c7d8 100644 --- a/.markdownlint.yaml +++ b/.markdownlint.yaml @@ -8,8 +8,7 @@ MD013: line_length: 1000 # MD024/no-duplicate-heading/no-duplicate-header - Multiple headings with the same content -MD024: - allow_different_nesting: true +MD024: false # MD026/no-trailing-punctuation - Trailing punctuation in heading MD026: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e23a7d2b1..10612ecc4 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -18,7 +18,7 @@ repos: args: ["--config", "./tools/pyproject.toml"] - repo: https://github.com/charliermarsh/ruff-pre-commit - rev: v0.1.9 + rev: v0.1.15 hooks: - id: ruff name: ruff-cellxgene-census @@ -88,6 +88,6 @@ repos: files: ^api/python/notebooks - repo: https://github.com/igorshubovych/markdownlint-cli - rev: v0.38.0 + rev: v0.39.0 hooks: - id: markdownlint diff --git a/api/python/cellxgene_census/tests/test_acceptance.py b/api/python/cellxgene_census/tests/test_acceptance.py index dac5c80c1..b9635aefd 100644 --- a/api/python/cellxgene_census/tests/test_acceptance.py +++ b/api/python/cellxgene_census/tests/test_acceptance.py @@ -10,6 +10,7 @@ See README.md for historical data. """ + from typing import Any, Dict, Iterator, Optional, Tuple import pyarrow as pa diff --git a/api/python/cellxgene_census/tests/test_lts_compat.py b/api/python/cellxgene_census/tests/test_lts_compat.py index cb8471995..acefb01a0 100644 --- a/api/python/cellxgene_census/tests/test_lts_compat.py +++ b/api/python/cellxgene_census/tests/test_lts_compat.py @@ -5,6 +5,7 @@ Where there are known and accepted incompatibilities, use `pytest.skip` to codify them. """ + from __future__ import annotations from collections import deque diff --git a/tools/cellxgene_census_builder/pyproject.toml b/tools/cellxgene_census_builder/pyproject.toml index 0025854a5..c22aaa4cc 100644 --- a/tools/cellxgene_census_builder/pyproject.toml +++ b/tools/cellxgene_census_builder/pyproject.toml @@ -38,7 +38,7 @@ dependencies= [ "fsspec==2023.12.2", "s3fs==2023.12.2", "requests==2.31.0", - "aiohttp==3.9.1", + "aiohttp==3.9.3", "Cython", # required by owlready2 "wheel", # required by owlready2 "owlready2==0.44", diff --git a/tools/cellxgene_census_builder/src/cellxgene_census_builder/build_state.py b/tools/cellxgene_census_builder/src/cellxgene_census_builder/build_state.py index f036431f5..0561927cf 100644 --- a/tools/cellxgene_census_builder/src/cellxgene_census_builder/build_state.py +++ b/tools/cellxgene_census_builder/src/cellxgene_census_builder/build_state.py @@ -2,6 +2,7 @@ Manage the configuration and dynamic build state for the Census build. """ + import functools import io import os diff --git a/tools/cellxgene_census_builder/src/cellxgene_census_builder/release_manifest.py b/tools/cellxgene_census_builder/src/cellxgene_census_builder/release_manifest.py index 0c78bda45..5a4a84201 100644 --- a/tools/cellxgene_census_builder/src/cellxgene_census_builder/release_manifest.py +++ b/tools/cellxgene_census_builder/src/cellxgene_census_builder/release_manifest.py @@ -1,6 +1,7 @@ """ Tools to manage the release.json manifest file. """ + import json from typing import Dict, Optional, Union, cast diff --git a/tools/census_contrib/src/census_contrib/validate.py b/tools/census_contrib/src/census_contrib/validate.py index 849bbc4b7..bd3fc465e 100644 --- a/tools/census_contrib/src/census_contrib/validate.py +++ b/tools/census_contrib/src/census_contrib/validate.py @@ -1,6 +1,7 @@ """ Validate an embedding """ + from __future__ import annotations import concurrent.futures