Skip to content

Commit

Permalink
fixup noxfile issues, and also tripping over a silly CVE on py (#614)
Browse files Browse the repository at this point in the history
fixup noxfile issues, and also tripping over a silly CVE on py
  • Loading branch information
andrewbolster authored Feb 5, 2023
1 parent 18d6e98 commit aa29489
Show file tree
Hide file tree
Showing 7 changed files with 1,484 additions and 1,413 deletions.
12 changes: 6 additions & 6 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
repos:
- repo: /~https://github.com/pre-commit/mirrors-prettier
rev: v2.3.0
rev: v3.0.0-alpha.4
hooks:
- id: prettier
- repo: /~https://github.com/asottile/reorder_python_imports
rev: v2.6.0
rev: v3.9.0
hooks:
- id: reorder-python-imports
args: [--application-directories=src]
- repo: /~https://github.com/psf/black
rev: 22.3.0
rev: 23.1.0
hooks:
- id: black
name: black
Expand All @@ -18,7 +18,7 @@ repos:
types: [python]
require_serial: true
- repo: /~https://github.com/pre-commit/pre-commit-hooks
rev: v4.0.1
rev: v4.4.0
hooks:
- id: check-added-large-files
- id: check-toml
Expand All @@ -34,7 +34,7 @@ repos:
- id: trailing-whitespace
- id: mixed-line-ending
- id: trailing-whitespace
- repo: https://gitlab.com/pycqa/flake8
rev: 3.7.9
- repo: https://github.com/PyCQA/flake8
rev: 6.0.0
hooks:
- id: flake8
4 changes: 2 additions & 2 deletions noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@ def safety(session: Session) -> None:
"check",
"--full-report",
f"--file={requirements}",
"--ignore",
"44715",
"--ignore=44715",
"--ignore=51457",
)


Expand Down
2,872 changes: 1,472 additions & 1,400 deletions poetry.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ classifiers = [
]

[tool.poetry.dependencies]
python = ">=3.8.0,<3.10"
python = ">=3.8.0,<=3.11"
click = "^8.0.1"
click-log = ">=0.3.2,<0.5.0"
psycopg2-binary = "^2.9.1"
Expand Down
1 change: 0 additions & 1 deletion src/bolster/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,6 @@ def get_recursively(search_dict: Dict, field: str) -> List:
fields_found = []

for key, value in search_dict.items():

if key == field:
fields_found.append(value)

Expand Down
1 change: 0 additions & 1 deletion src/bolster/stats/distributions.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ def best_fit_distribution(

# Estimate distribution parameters from data
for distribution in tqdm(DISTRIBUTIONS):

# Try to fit the distribution
try:
# Ignore warnings from data that can't be fit
Expand Down
5 changes: 3 additions & 2 deletions src/bolster/utils/aws/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,6 @@ def get_matching_s3_objects(
kwargs["Prefix"] = prefix

while True:

# The S3 API response is a large blob of metadata.
# 'Contents' contains information about the listed objects.
resp = client.list_objects_v2(**kwargs)
Expand Down Expand Up @@ -663,7 +662,9 @@ def query(
) as cur:
cur.execute(q, vars=kwargs if kwargs is not None else {})
yield from cur
except BaseException: # todo workout what the likely exceptions being thrown by postgreql are likely to be
except (
BaseException
): # todo workout what the likely exceptions being thrown by postgreql are likely to be
logger.exception(f"Failed with connection: {redshift_conn_dict}")
raise

Expand Down

0 comments on commit aa29489

Please sign in to comment.