From c6b63d3123c0ce3a5267027d8a8ba57a28f1196a Mon Sep 17 00:00:00 2001 From: Jim Albright Date: Wed, 11 Dec 2024 11:25:05 -0800 Subject: [PATCH 1/4] Update builds --- .bandit | 2 -- .flake8 | 46 ------------------------------------- .github/workflows/build.yml | 1 + 3 files changed, 1 insertion(+), 48 deletions(-) delete mode 100644 .bandit delete mode 100644 .flake8 diff --git a/.bandit b/.bandit deleted file mode 100644 index 2206b46d..00000000 --- a/.bandit +++ /dev/null @@ -1,2 +0,0 @@ -[bandit] -exclude: tests \ No newline at end of file diff --git a/.flake8 b/.flake8 deleted file mode 100644 index 46becb2f..00000000 --- a/.flake8 +++ /dev/null @@ -1,46 +0,0 @@ -[flake8] -# Use the following flake8 plugins: -# ANN : flake8-annotations -# B,B9 : flake8-bugbear -# BLK : flake8-black -# C : mccabe code complexity -# D : flake8-docstrings -# DAR : darglint. Not currently in use because it was too slow. -# F : pyflakes -# I : flake8-isort -# S : flake8-bandit -# W,E : pycodestyle (pep8) warnings and errors -select = ANN,B,B9,BLK,C,D,E,F,I,S,W - -# Ignore these flake8 errors across the board. -extend-ignore = - # Missing type annotation for self - ANN101, - # Missing type annotation for cls - ANN102, - # Missing type annotation for special method - ANN204, - # Missing docstring in public module - D100, - # Missing docstring in public package - D104, - # Colons should not have whitespace before them (needed for black) - E203, - # Line break before binary operator (needed for black) - W503, - -# Only use strict docstring linting in the api/ or cli/ directory. Unfortunately it's not -# possible to enable only those directories, so instead we disable strict docstring linting -# everywhere else. -# Also allow unused imports in __init__ files. -per-file-ignores = - tests/**:D105,D106,D107,D205,D207,D208,D212,D214,D215,D301,D4,S101,E266 - src/vivarium/lib/**:D105,D106,D107,D205,D207,D208,D212,D214,D215,D301,D4 - **/__init__.py:F401 - -# Function complexity and line length -max-complexity = 10 -max-line-length = 95 - -# Docstrings -docstring-convention = google \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0441e8ae..06de18a5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,6 +22,7 @@ jobs: dependencies: "vivarium,gbd_mapping" skip_mypy: true install_type: "[test,docs]" + python_version: ${{ matrix.python-version }} secrets: NOTIFY_EMAIL: ${{ secrets.NOTIFY_EMAIL }} NOTIFY_PASSWORD: ${{ secrets.NOTIFY_PASSWORD }} From d8d09930f65dd8c17a4c0d5d3cf32abc2e591c8c Mon Sep 17 00:00:00 2001 From: Jim Albright Date: Wed, 11 Dec 2024 11:42:04 -0800 Subject: [PATCH 2/4] Remove dir from rm comamnd --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 93662c74..f22c503e 100644 --- a/Makefile +++ b/Makefile @@ -99,6 +99,6 @@ build-package: $(MAKE_SOURCES) # Build the package as a pip wheel @echo "Ignore, Created by Makefile, `date`" > $@ clean: # Delete build artifacts and do any custom cleanup such as spinning down services - @rm -rf format lint build-doc build-package integration .pytest_cache + @rm -rf format build-doc build-package integration .pytest_cache @rm -rf dist output $(shell find . -type f -name '*py[co]' -delete -o -type d -name __pycache__ -delete) From 031d1a1b9980fe48eb781e2cbeed42ac5f8ad378 Mon Sep 17 00:00:00 2001 From: Jim Albright Date: Wed, 11 Dec 2024 11:54:05 -0800 Subject: [PATCH 3/4] Empty commit From 54dae3fa50f43b34645931cf62e5d843bc857c16 Mon Sep 17 00:00:00 2001 From: Jim Albright Date: Wed, 11 Dec 2024 12:02:38 -0800 Subject: [PATCH 4/4] Empty commit