Skip to content

Commit

Permalink
Merge pull request #39 from questionlp/develop
Browse files Browse the repository at this point in the history
Bump flask, gunicorn, ruff and pytest dependencies
  • Loading branch information
questionlp authored Apr 17, 2024
2 parents 1e8a4cb + 6e9a445 commit c398f26
Show file tree
Hide file tree
Showing 7 changed files with 60 additions and 43 deletions.
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# Changes

## 2.9.2

### Component Changes

- Upgrade flask from 3.0.0
- Upgrade gunicorn from 21.2.0 to 22.0.0
- Upgrade numpy from 1.26.3 to 1.26.4
- Upgrade pytz from 2023.3.post1 to 2024.1

### Development Changes

- Upgrade ruff from 0.1.13 to 0.3.6
- Upgrade pytest from 7.4.4 to 8.1.1

## 2.9.1

### Development Changes
Expand Down
6 changes: 3 additions & 3 deletions app/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ def create_app():
app.jinja_env.filters["markdown"] = utility.md_to_html

# Check to see if panelistscore_decimal column exists and set a flag
app.config["app_settings"][
"has_decimal_scores_column"
] = utility.panelist_decimal_score_exists(database_settings=app.config["database"])
app.config["app_settings"]["has_decimal_scores_column"] = (
utility.panelist_decimal_score_exists(database_settings=app.config["database"])
)

# Register application blueprints
app.register_blueprint(main_bp)
Expand Down
6 changes: 3 additions & 3 deletions app/panelists/reports/streaks.py
Original file line number Diff line number Diff line change
Expand Up @@ -246,9 +246,9 @@ def calculate_panelist_win_streaks(
panelist["longest_streak"] = longest_streak
panelist["longest_streak_dates"] = longest_streak_show_dates
panelist["longest_streak_with_draws"] = longest_streak_with_draws
panelist[
"longest_streak_with_draws_dates"
] = longest_streak_show_dates_with_draws
panelist["longest_streak_with_draws_dates"] = (
longest_streak_show_dates_with_draws
)
win_streaks.append(panelist)

return win_streaks
2 changes: 1 addition & 1 deletion app/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
# vim: set noai syntax=python ts=4 sw=4:
"""Version module for Wait Wait Reports."""

APP_VERSION = "2.9.1"
APP_VERSION = "2.9.2"
55 changes: 29 additions & 26 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,28 +7,9 @@ line-length = 88
minversion = "7.4"
filterwarnings = ["ignore::DeprecationWarning:mysql.*:"]
norecursedirs = [".git", "venv", "dist", ".eggs", "wwdtm.egg-info"]
#collect_ignore = ["perf_test.py"]

[tool.ruff]
select = [
"B", # flake8-bugbear
"C4", # flake8-comprehensions
"D", # pydocstyle
"E", # Error
"F", # pyflakes
"I", # isort
"ISC", # flake8-implicit-str-concat
"N", # pep8-naming
"PGH", # pygrep-hooks
"PTH", # flake8-use-pathlib
"Q", # flake8-quotes
"S", # bandit
"SIM", # flake8-simplify
"TRY", # tryceratops
"UP", # pyupgrade
"W", # Warning
"YTT", # flake8-2020
]
target-version = "py310"

exclude = [
"migrations",
Expand All @@ -41,6 +22,9 @@ exclude = [
".venv",
]

line-length = 88 # Must agree with Black

[tool.ruff.lint]
ignore = [
"B905", # zip strict=True; remove once python <3.10 support is dropped.
"D100",
Expand All @@ -59,15 +43,34 @@ ignore = [
"TRY003", # Avoid specifying messages outside exception class; overly strict, especially for ValueError
"S608",
]
line-length = 88 # Must agree with Black

[tool.ruff.flake8-bugbear]
select = [
"B", # flake8-bugbear
"C4", # flake8-comprehensions
"D", # pydocstyle
"E", # Error
"F", # pyflakes
"I", # isort
"ISC", # flake8-implicit-str-concat
"N", # pep8-naming
"PGH", # pygrep-hooks
"PTH", # flake8-use-pathlib
"Q", # flake8-quotes
"S", # bandit
"SIM", # flake8-simplify
"TRY", # tryceratops
"UP", # pyupgrade
"W", # Warning
"YTT", # flake8-2020
]

[tool.ruff.lint.flake8-bugbear]
extend-immutable-calls = ["chr", "typer.Argument", "typer.Option"]

[tool.ruff.pydocstyle]
convention = "numpy"
[tool.ruff.lint.pydocstyle]
convention = "pep257"

[tool.ruff.per-file-ignores]
[tool.ruff.lint.per-file-ignores]
"tests/*.py" = [
"D100",
"D101",
Expand All @@ -82,5 +85,5 @@ convention = "numpy"
"S106", # possible hardcoded password.
]

[tool.ruff.pep8-naming]
[tool.ruff.lint.pep8-naming]
staticmethod-decorators = ["pydantic.validator", "pydantic.root_validator"]
12 changes: 6 additions & 6 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
ruff==0.3.6
black==24.3.0
ruff==0.1.13
pytest==7.4.4
pytest==8.1.1

Flask==3.0.0
gunicorn==21.2.0
Flask==3.0.3
gunicorn==22.0.0
Markdown==3.5.2
mysql-connector-python==8.2.0
numpy==1.26.3
pytz==2023.3.post1
numpy==1.26.4
pytz==2024.1
8 changes: 4 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Flask==3.0.0
gunicorn==21.2.0
Flask==3.0.3
gunicorn==22.0.0
Markdown==3.5.2
mysql-connector-python==8.2.0
numpy==1.26.3
pytz==2023.3.post1
numpy==1.26.4
pytz==2024.1

0 comments on commit c398f26

Please sign in to comment.