Skip to content

Commit

Permalink
Merge tag 'weblate-5.1.1'
Browse files Browse the repository at this point in the history
Version 5.1.1

# -----BEGIN PGP SIGNATURE-----
#
# iQIzBAABCAAdFiEEh+Zzr4P2w6DDRMjD9KoinU1YwkUFAmU5F94ACgkQ9KoinU1Y
# wkVbDA/8Dg1SH0fZ4x6TDp9t6L2p2bjMF5gpkd2c/pld5LA3ob0clCmXJ9BWT3V7
# /mGSXeQJ11Q/C3JA5QM2rBOrvxTEiPY5xuQNmuLF2G8lt3utKMd42jO8IBQZtDGr
# zpdSFoL9/g3fZupsVjRcuYaIvsmFluNgaWCRtNxLpYH0auQ6+5fw2YSxPU7fz+W4
# 4fjiOM0WkdEziGl6ywd6ogCeoAshKniPVCsbVuGn3Hl4mPe9S5ecnlh05wszTdrL
# 1i/Bwzls3LJy+2W2IO0huWOh5p2ZVD85S4SG4nDChy225D+gnq73FOgFJ5iyK3Ph
# DHgBdSwR+O1zv4WL8HcoQzdmc8LYThMx2O3zPN6n8VOiJjtBhQGkcNaMhIeHPJ7a
# 1UjhcPMt2o86EqBtPgSQbs0+wBjEFg0WTl1xfrguWr5+tvlQPU3036Ux61EK83Nf
# lEyuIx7+hydCwTT1zqmx75pcgrbzDbn3e1AboQFu2KXyib4bIVaBEnGMrDmkuf2e
# Dn5Uz/u+EK3TlDHAiToA+QHBbaUoVCRuaPCRCcY8Z6iMSgBlLxiuBLDlc4ik1fiq
# LrriGxo7fyi7lSiZ94ZkiD3KxdcWoDx9K1OftsnDBAiwTm9U48JjsfPwV88TzKxe
# 11D2wZjdqdEuRK8Xw0286sAyGScvYSlbh+EJ2MPcy2+ekd8EG2g=
# =w5qH
# -----END PGP SIGNATURE-----
# gpg: Signature made 25.10.2023 15:27:58 �rodkowoeuropejski czas letni
# gpg:                using RSA key 87E673AF83F6C3A0C344C8C3F4AA229D4D58C245
# gpg: Can't check signature: No public key
  • Loading branch information
p0358 committed Oct 27, 2023
2 parents 0baf7e5 + 19ac516 commit ddbbb1a
Show file tree
Hide file tree
Showing 875 changed files with 558,644 additions and 370,252 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout repository
uses: actions/checkout@v4.0.0
uses: actions/checkout@v4.1.1
- name: Install apt dependencies
run: sudo ./ci/apt-install $CI_DATABASE
- name: Set up Python
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/licenses-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
pull-requests: write

steps:
- uses: actions/checkout@v4.0.0
- uses: actions/checkout@v4.1.1
with:
submodules: true
- uses: actions/cache@v3
Expand All @@ -43,7 +43,7 @@ jobs:
- run: ./scripts/generate-license-data
- name: Update renovate branch
if: github.ref != 'refs/heads/main'
uses: stefanzweifel/git-auto-commit-action@v4
uses: stefanzweifel/git-auto-commit-action@v5
with:
commit_message: 'utils: Update SPDX license data'
- name: Create Pull Request
Expand Down
34 changes: 34 additions & 0 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# Copyright © Michal Čihař <[email protected]>
#
# SPDX-License-Identifier: GPL-3.0-or-later

name: macOS

on:
push:
branches-ignore:
- deepsource-fix-**
- renovate/**
- weblate
pull_request:

permissions:
contents: read

jobs:
macos:
# This verifies that installation instructions works, any changes here
# need to be reflected in docs/admin/install/venv-macos.rst
runs-on: macos-13
env:
PYTHONUNBUFFERED: 1
PYTHONWARNINGS: default,ignore:unclosed:ResourceWarning
steps:
- uses: actions/checkout@v4
- run: brew update
- name: Install Python
run: brew link --overwrite python
- name: Install brew dependencies
run: brew install pango cairo gobject-introspection glib libyaml tvuotila/libxmlsec1/[email protected] openssl pkg-config zstd xxhash
- name: Install Weblate
run: pip3 install -e .[all,test]
50 changes: 3 additions & 47 deletions .github/workflows/migrations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,10 @@ jobs:
run: ./ci/services-up ${{ matrix.database }}
- name: Install apt dependencies
run: sudo ./ci/apt-install $CI_DATABASE
- name: Install additional deps
# TODO: Remove this in Weblate 5.1 once migtration from 4.x is not supported
run: sudo apt-get install libleptonica-dev libtesseract-dev tesseract-ocr
- name: Set up Python 3.7
- name: Set up Python 3.11
uses: actions/setup-python@v4
with:
python-version: |
3.7
python-version: |-
3.11
cache: pip
cache-dependency-path: '**/requirements*.txt'
Expand All @@ -56,48 +52,8 @@ jobs:
./ci/pip-install migrations
- name: Check missing migrations
run: ./ci/run-checkmigrate
- name: Migrate from 4.0
run: ./ci/run-migrate 4.0
- name: Migrate from 4.0.4
run: ./ci/run-migrate 4.0.4
- name: Migrate from 4.1
run: ./ci/run-migrate 4.1
- name: Migrate from 4.2
run: ./ci/run-migrate 4.2
- name: Migrate from 4.3
run: ./ci/run-migrate 4.3
- name: Migrate from 4.4
run: ./ci/run-migrate 4.4
- name: Migrate from 4.5
run: ./ci/run-migrate 4.5
- name: Migrate from 4.6
run: ./ci/run-migrate 4.6
- name: Migrate from 4.7
run: ./ci/run-migrate 4.7
- name: Migrate from 4.8
run: ./ci/run-migrate 4.8
- name: Migrate from 4.9
run: ./ci/run-migrate 4.9
- name: Migrate from 4.10
run: ./ci/run-migrate 4.10
- name: Migrate from 4.11
run: ./ci/run-migrate 4.11
- name: Migrate from 4.12
run: ./ci/run-migrate 4.12
- name: Migrate from 4.13
run: ./ci/run-migrate 4.13
- name: Migrate from 4.14
run: ./ci/run-migrate 4.14
- name: Migrate from 4.15
run: ./ci/run-migrate 4.15
- name: Migrate from 4.16
run: ./ci/run-migrate 4.16
- name: Migrate from 4.17
run: ./ci/run-migrate 4.17
- name: Migrate from 4.18
run: ./ci/run-migrate 4.18
- name: Migrate from 5.0
run: ./ci/run-migrate 5.0
run: ./ci/run-migrate 5.0.2
- name: Coverage
run: |
coverage combine
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/schema-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
pull-requests: write

steps:
- uses: actions/checkout@v4.0.0
- uses: actions/checkout@v4.1.1
- name: Set up Python
uses: actions/setup-python@v4
with:
Expand All @@ -34,7 +34,7 @@ jobs:
continue-on-error: true
- name: Update renovate branch
if: github.ref != 'refs/heads/main'
uses: stefanzweifel/git-auto-commit-action@v4
uses: stefanzweifel/git-auto-commit-action@v5
with:
commit_message: 'docs: Update JSON schemas'
- name: Create Pull Request
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v4.0.0
uses: actions/checkout@v4.1.1
with:
persist-credentials: false

- name: Run analysis
uses: ossf/scorecard-action@v2.2.0
uses: ossf/scorecard-action@v2.3.1
with:
results_file: results.sarif
results_format: sarif
Expand All @@ -61,6 +61,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: Upload to code-scanning
uses: github/codeql-action/upload-sarif@v2.21.7
uses: github/codeql-action/upload-sarif@v2.22.4
with:
sarif_file: results.sarif
14 changes: 0 additions & 14 deletions .github/workflows/setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,17 +116,3 @@ jobs:
with:
flags: setup
name: dist

macos:
# This verifies that installation instructions works, any changes here
# need to be reflected in docs/admin/install/venv-macos.rst
runs-on: macos-13
env:
PYTHONUNBUFFERED: 1
PYTHONWARNINGS: default,ignore:unclosed:ResourceWarning
steps:
- uses: actions/checkout@v4
- name: Install brew dependencies
run: brew install python pango cairo gobject-introspection glib libyaml tvuotila/libxmlsec1/[email protected]
- name: Install Weblate
run: pip3 install -e .[all,test]
1 change: 1 addition & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ jobs:
- '3.9'
- '3.10'
- '3.11'
- '3.12'
requirements: [latest]
database: [postgresql]
include:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/yarn-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- run: ./scripts/yarn-update
- name: Update branch
if: github.ref != 'refs/heads/main'
uses: stefanzweifel/git-auto-commit-action@v4
uses: stefanzweifel/git-auto-commit-action@v5
with:
commit_message: 'js: Update vendored libraries'
- name: Create Pull Request
Expand Down
27 changes: 11 additions & 16 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# See https://pre-commit.com/hooks.html for more hooks
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.5.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
Expand All @@ -19,26 +19,21 @@ repos:
args: [--no-sort-keys, --autofix, --no-ensure-ascii]
exclude: ^weblate/trans/fixtures/simple-project.json|weblate/trans/tests/data/.*.json$
- repo: https://github.com/adamchainz/django-upgrade
rev: 1.14.1
rev: 1.15.0
hooks:
- id: django-upgrade
args: [--target-version, '4.2']
- repo: https://github.com/adrienverge/yamllint
rev: v1.32.0
hooks:
- id: yamllint
- repo: https://github.com/asottile/pyupgrade
rev: v3.10.1
hooks:
- id: pyupgrade
args: [--py39-plus]
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.0.289
rev: v0.1.2
hooks:
- id: ruff
args: [--fix, --exit-non-zero-on-fix]
- repo: https://github.com/psf/black
rev: 23.9.1
rev: 23.10.1
hooks:
- id: black
- repo: https://github.com/asottile/blacken-docs
Expand All @@ -55,7 +50,7 @@ repos:
- id: prettier
types_or: [css, javascript]
- repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
rev: v2.10.0
rev: v2.11.0
hooks:
- id: pretty-format-yaml
args: [--autofix, --indent, '2']
Expand All @@ -70,32 +65,32 @@ repos:
- mdformat-black==0.1.1
- mdformat-shfmt==0.1.0
- repo: https://github.com/pre-commit/mirrors-eslint
rev: v8.49.0
rev: v8.52.0
hooks:
- id: eslint
args: [--format=compact]
additional_dependencies:
- [email protected]
- eslint@8.49.0
- eslint-plugin-import@2.28.1
- eslint@8.52.0
- eslint-plugin-import@2.29.0
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected].0
- [email protected].1
- repo: https://github.com/awebdeveloper/pre-commit-stylelint
rev: 0.0.2
hooks:
- id: stylelint
args: [--formatter=compact]
additional_dependencies:
- stylelint@15.10.3
- stylelint@15.11.0
- repo: https://github.com/fsfe/reuse-tool
rev: v2.1.0
hooks:
- id: reuse
- repo: https://github.com/shellcheck-py/shellcheck-py
rev: v0.9.0.5
rev: v0.9.0.6
hooks:
- id: shellcheck
require_serial: true
Expand Down
2 changes: 1 addition & 1 deletion ci/apt-install
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ apt-get install -y \
git-svn \
gnupg \
subversion \
postgresql-client-15 \
postgresql-client-16 \
pkg-config \
libxml2-dev \
libacl1-dev \
Expand Down
2 changes: 1 addition & 1 deletion ci/docker-compose-mariadb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ services:
environment:
MYSQL_ROOT_PASSWORD: weblate
cache:
image: redis:7.2.1-alpine
image: redis:7.2.2-alpine
restart: always
ports:
- 60001:6379
2 changes: 1 addition & 1 deletion ci/docker-compose-mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ services:
environment:
MYSQL_ROOT_PASSWORD: weblate
cache:
image: redis:7.2.1-alpine
image: redis:7.2.2-alpine
restart: always
ports:
- 60001:6379
9 changes: 4 additions & 5 deletions ci/docker-compose-postgresql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,16 @@ version: '3'

services:
database:
image: postgres:15.4
image: postgres:16.0
ports:
- 60000:5432
volumes:
# make postgres faster and non-durable, see https://www.postgresql.org/docs/current/non-durability.html
- ./postgres:/docker-entrypoint-initdb.d
# make postgres faster and non-durable, see https://www.postgresql.org/docs/current/non-durability.html
command: [postgres, -c, fsync=off, -c, synchronous_commit=off, -c, full_page_writes=off, -c, checkpoint_timeout=3600, -c, max_wal_size=4096]
environment:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: weblate
cache:
image: redis:7.2.1-alpine
image: redis:7.2.2-alpine
restart: always
ports:
- 60001:6379
5 changes: 4 additions & 1 deletion ci/pip-install
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,10 @@ else
pip install --no-deps --upgrade --force-reinstall https://github.com/translate/translate/archive/master.zip
pip install --no-deps --upgrade --force-reinstall https://github.com/WeblateOrg/language-data/archive/main.zip
pip install --no-deps --upgrade --force-reinstall https://github.com/WeblateOrg/translation-finder/archive/main.zip
pip install --upgrade --pre Django
# TODO: re-enable Django 5.0 testing, blocked by:
# https://github.com/celery/django-celery-beat/issues/680
# https://github.com/mfogel/django-timezone-field/issues/112
#pip install --upgrade --pre Django
fi
fi

Expand Down
20 changes: 0 additions & 20 deletions ci/postgres/postgres-nondurable.sh

This file was deleted.

Loading

0 comments on commit ddbbb1a

Please sign in to comment.