Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(sync) Syncing changes from dev to alpha #431

Merged
merged 9 commits into from
Aug 4, 2023
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ repos:
exclude: migrations* | docs*
additional_dependencies: [toml]
- repo: https://github.com/psf/black
rev: 23.3.0
rev: 23.7.0
hooks:
- id: black
language_version: python3.9
- repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
rev: v2.9.0
rev: v2.10.0
hooks:
- id: pretty-format-toml
args: [--autofix]
Expand All @@ -48,6 +48,6 @@ repos:
- id: pretty-format-yaml
args: [--autofix, --indent, '2']
- repo: https://github.com/Riverside-Healthcare/djLint
rev: v1.31.1
rev: v1.32.1
hooks:
- id: djlint-jinja
67 changes: 38 additions & 29 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"@semantic-release/release-notes-generator": "11.0.3",
"browser-sync": "^2.29.1",
"cz-conventional-changelog": "3.3.0",
"eslint": "8.43.0",
"eslint": "8.44.0",
"gulp-concat": "2.6.1",
"gulp-cssnano": "2.1.3",
"gulp-purgecss": "5.0.0",
Expand Down
83 changes: 5 additions & 78 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ flask-assets = {git = "https://github.com/christopherpickering/flask-assets.git"
flask-redis = "^0.4.0"
flask-session2 = "^1.2.0"
gevent = "^23.0.0"
gunicorn = "^20.1.0"
gunicorn = "^21.0.0"
is-safe-url = "^1.0"
paramiko = "^3.0.0"
pathvalidate = "^3.0.0"
Expand Down
4 changes: 2 additions & 2 deletions runner/scripts/em_python.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ def run(self) -> Optional[List[Path]]:

# if output is not a file list, then swallow it.

if isinstance(eval(self.output), List):
return [Path(x) for x in eval(self.output)]
if isinstance(self.output, List):
return self.output
return None

def __build_env(self) -> None:
Expand Down