Skip to content

Commit

Permalink
Merge pull request #3678 from alephdata/dependabot/pip/develop/dev-de…
Browse files Browse the repository at this point in the history
…pendencies-84a3d375eb

Bump the dev-dependencies group with 4 updates
  • Loading branch information
stchris authored Apr 5, 2024
2 parents 928acbf + d71c236 commit b58c0ee
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 15 deletions.
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ COMPOSE_E2E=docker-compose -f docker-compose.dev.yml -f docker-compose.e2e.yml
APPDOCKER=$(COMPOSE) run --rm app
UIDOCKER=$(COMPOSE) run --no-deps --rm ui
ALEPH_TAG=latest
BLACK_OPTS=--extend-exclude aleph/migrate

all: build upgrade web

Expand All @@ -28,13 +29,13 @@ lint-ui:
$(UIDOCKER) npm run lint

format:
black aleph/
black $(BLACK_OPTS) aleph/

format-ui:
$(UIDOCKER) npm run format

format-check:
black --check aleph/
black --check $(BLACK_OPTS) aleph/

format-check-ui:
$(UIDOCKER) npm run format:check
Expand Down
1 change: 1 addition & 0 deletions aleph/logic/profiles.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
Outside of its own collection, any entity can be linked to any number of profiles.
"""

import logging
from sqlalchemy import or_
from sqlalchemy.orm import aliased
Expand Down
8 changes: 5 additions & 3 deletions aleph/tests/test_profiles.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,11 @@ def test_decide_xref(self):
assert profile_t1.id == profile_t2.id, (profile_t1, profile_t2)
assert len(profile_t2.items().all()) == 3, profile_t2
assert all(
e.judgement == Judgement.POSITIVE
if e.entity_id.startswith("a")
else Judgement.NEGATIVE
(
e.judgement == Judgement.POSITIVE
if e.entity_id.startswith("a")
else Judgement.NEGATIVE
)
for e in profile_t2.items()
)

Expand Down
8 changes: 4 additions & 4 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
bump2version==1.0.1
Babel==2.12.1
black==23.12.1
playwright==1.40.0
pytest-playwright==0.4.3
ruff===0.1.9
black==24.3.0
playwright==1.42.0
pytest-playwright==0.4.4
ruff===0.3.5
13 changes: 7 additions & 6 deletions ruff.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Enable pycodestyle (`E`) and Pyflakes (`F`) codes by default.
select = ["E", "F"]
ignore = ["E501"]
lint.select = ["E", "F"]
lint.ignore = ["E501"]

# Allow autofix for all enabled rules (when `--fix`) is provided.
fixable = ["A", "B", "C", "D", "E", "F", "G", "I", "N", "Q", "S", "T", "W", "ANN", "ARG", "BLE", "COM", "DJ", "DTZ", "EM", "ERA", "EXE", "FBT", "ICN", "INP", "ISC", "NPY", "PD", "PGH", "PIE", "PL", "PT", "PTH", "PYI", "RET", "RSE", "RUF", "SIM", "SLF", "TCH", "TID", "TRY", "UP", "YTT"]
unfixable = []
lint.fixable = ["A", "B", "C", "D", "E", "F", "G", "I", "N", "Q", "S", "T", "W", "ANN", "ARG", "BLE", "COM", "DJ", "DTZ", "EM", "ERA", "EXE", "FBT", "ICN", "INP", "ISC", "NPY", "PD", "PGH", "PIE", "PL", "PT", "PTH", "PYI", "RET", "RSE", "RUF", "SIM", "SLF", "TCH", "TID", "TRY", "UP", "YTT"]
lint.unfixable = []

# Exclude a variety of commonly ignored directories.
exclude = [
Expand All @@ -29,16 +29,17 @@ exclude = [
"dist",
"node_modules",
"venv",
"aleph/migrate",
]

# Same as Black.
line-length = 88

# Allow unused variables when underscore-prefixed.
dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
lint.dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"

target-version = "py38"

[mccabe]
[lint.mccabe]
# Unlike Flake8, default to a complexity level of 10.
max-complexity = 10

0 comments on commit b58c0ee

Please sign in to comment.