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

Update all minor versions (master) (minor) #2581

Merged
merged 10 commits into from
Nov 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .bandit.yaml

This file was deleted.

13 changes: 11 additions & 2 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:

- uses: actions/setup-python@v5
with:
python-version: '3.13'
python-version: '3.11'
- run: python3 -m pip install --requirement=ci/requirements.txt

- uses: actions/cache@v4
Expand All @@ -46,7 +46,7 @@ jobs:
key: pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
restore-keys: "pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}\npre-commit-"
- run: pre-commit run --all-files
- run: git diff --exit-code --patch > /tmp/pre-commit.patch || true
- run: git diff --exit-code --patch > /tmp/pre-commit.patch || true && git reset --hard
if: failure()
- uses: actions/upload-artifact@v4
with:
Expand All @@ -64,6 +64,14 @@ jobs:

- name: Checks
run: make checks
- run: git diff --exit-code --patch > /tmp/ruff.patch || true && git reset --hard
if: failure()
- uses: actions/upload-artifact@v4
with:
name: Apply Ruff lint fix.patch
path: /tmp/ruff.patch
retention-days: 1
if: failure()

- name: Tests
run: make tests
Expand All @@ -78,6 +86,7 @@ jobs:
retention-days: 5
if: failure()

- run: git reset --hard
- name: Publish
run: c2cciutils-publish
if: env.HAS_SECRETS == 'HAS_SECRETS'
Expand Down
33 changes: 11 additions & 22 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -96,37 +96,22 @@ repos:
rev: v0.1.8
hooks:
- id: ripsecrets
- repo: https://github.com/asottile/pyupgrade
rev: v3.19.0
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.7.3
hooks:
- id: pyupgrade
args:
- --py39-plus
- repo: https://github.com/PyCQA/autoflake
rev: v2.3.1
hooks:
- id: autoflake
- repo: https://github.com/PyCQA/isort
rev: 5.13.2
hooks:
- id: isort
args:
- --project=tilecloud
- repo: https://github.com/psf/black
rev: 24.10.0
hooks:
- id: black
- id: ruff-format
- repo: https://github.com/PyCQA/prospector
rev: v1.13.0
hooks:
- id: prospector
args:
- --tool=pydocstyle
- --tool=ruff
- --die-on-tool-error
- --output-format=pylint
additional_dependencies:
- prospector-profile-duplicated==1.6.0 # pypi
- prospector-profile-utils==1.10.1 # pypi
- prospector-profile-duplicated==1.7.0 # pypi
- prospector-profile-utils==1.10.3 # pypi
- ruff==0.7.3 # pypi
- repo: https://github.com/sbrunner/jsonschema-validator
rev: 0.3.2
hooks:
Expand All @@ -136,3 +121,7 @@ repos:
rev: 39.10.1
hooks:
- id: renovate-config-validator
- repo: https://github.com/sbrunner/python-versions-hook
rev: 0.7.0
hooks:
- id: python-versions
20 changes: 7 additions & 13 deletions .prospector.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,17 @@ inherits:
- utils:base
- utils:no-design-checks
- utils:fix
- utils:unsafe
- utils:c2cwsgiutils
- duplicated

doc-warnings: true

ignore-paths:
- tilecloud_chain/configuration.py

pylint:
disable:
- missing-timeout # done globally by c2cwsgiutils

pydocstyle:
disable:
- D202 # No blank lines allowed after function docstring
- D104 # Missing docstring in public package
- D107 # Missing docstring in __init__
mypy:
options:
python-version: '3.10'

bandit:
ruff:
options:
config: .bandit.yaml
target-version: py310
2 changes: 0 additions & 2 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.2'

services:
db:
image: camptocamp/postgres:17-postgis-3
Expand Down
3 changes: 0 additions & 3 deletions gunicorn.conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ def on_starting(server: gunicorn.arbiter.Arbiter) -> None:

Called just before the master process is initialized.
"""

del server

prometheus.start()
Expand All @@ -87,7 +86,6 @@ def post_fork(server: gunicorn.arbiter.Arbiter, worker: gunicorn.workers.base.Wo

Called just after a worker has been forked.
"""

del server, worker

prometheus.cleanup()
Expand All @@ -99,7 +97,6 @@ def child_exit(server: gunicorn.arbiter.Arbiter, worker: gunicorn.workers.base.W

Called just after a worker has been exited, in the master process.
"""

del server

multiprocess.mark_process_dead(worker.pid) # type: ignore [no-untyped-call]
38 changes: 19 additions & 19 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
@@ -1,7 +1,7 @@
{
"devDependencies": {
"commander": "12.1.0",
"puppeteer": "23.5.3"
"puppeteer": "23.7.1"
},
"type": "module"
}
Loading
Loading