Skip to content

Commit

Permalink
Merge tag 'weblate-5.5.5'
Browse files Browse the repository at this point in the history
Version 5.5.5
  • Loading branch information
p0358 committed May 17, 2024
2 parents ab26627 + 72039b5 commit e511555
Show file tree
Hide file tree
Showing 1,028 changed files with 779,485 additions and 588,018 deletions.
19 changes: 0 additions & 19 deletions .eslintrc.yml

This file was deleted.

1 change: 1 addition & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ github: [nijel, WeblateOrg]
custom: https://weblate.org/donate/
liberapay: Weblate
open_collective: weblate
polar: WeblateOrg
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ body:
attributes:
label: How do you run Weblate?
options:
- ''
- weblate.org service
- Docker container
- PyPI module
Expand Down
20 changes: 9 additions & 11 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,15 @@
],
"versioning": "loose"
},
{
"matchPackageNames": [
"Django"
],
"matchDatasources": [
"pypi"
],
"separateMinorPatch": true
},
{
"matchPackageNames": [
"python"
Expand Down Expand Up @@ -106,17 +115,6 @@
"matchStrings": [
"renovate: datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\s+version: (?<currentValue>.*)\\s"
]
},
{
"fileMatch": [
"weblate_web/data.py"
],
"matchStrings": [
"VERSION = \"(?<currentValue>.*?)\""
],
"depNameTemplate": "Weblate",
"datasourceTemplate": "pypi",
"versioningTemplate": "pep440"
}
]
}
5 changes: 1 addition & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,24 +28,21 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout repository
uses: actions/[email protected].1
uses: actions/[email protected].5
- name: Install apt dependencies
run: sudo ./ci/apt-install
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: '3.11'
cache: pip
cache-dependency-path: requirements*.txt
- name: Used versions
run: ./ci/print-versions
- name: Install pip dependencies
run: ./ci/pip-install

- name: Initialize CodeQL
uses: github/codeql-action/init@v3
with:
setup-python-dependencies: false

- name: Autobuild
uses: github/codeql-action/autobuild@v3
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
echo "::add-matcher::.github/matchers/sphinx.json"
./ci/run-docs
echo "::remove-matcher owner=sphinx::"
- uses: actions/[email protected].1
- uses: actions/[email protected].3
with:
name: Documentation
path: docs/_build/html
Expand All @@ -55,7 +55,7 @@ jobs:
with:
python-version: '3.11'
cache: pip
cache-dependency-path: '**/requirements*.txt'
cache-dependency-path: docs/requirements.txt
- name: Install pip dependencies
run: pip install -r docs/requirements.txt
- name: Sphinx linkcheck
Expand All @@ -69,7 +69,7 @@ jobs:
sed 's@^@docs/@' docs/_build/linkcheck/output.txt
echo "::remove-matcher owner=sphinx::"
echo "::remove-matcher owner=sphinx-warn::"
- uses: actions/[email protected].1
- uses: actions/[email protected].3
if: always()
with:
name: Linkcheck report
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/licenses-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,24 @@ jobs:
pull-requests: write

steps:
- uses: actions/[email protected].1
- uses: actions/[email protected].5
with:
submodules: true
- uses: actions/cache@v4
with:
path: |
~/.cache/pip
~/.cache/pre-commit
key: ${{ runner.os }}-pre-commit-${{ hashFiles('**/requirements*.txt') }}-${{ hashFiles('.pre-commit-config.yaml') }}
key: ${{ runner.os }}-pre-commit-${{ hashFiles('pyproject.toml') }}-${{ hashFiles('.pre-commit-config.yaml') }}
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: '3.11'
- name: Install dependencies
run: |
python -m pip install --upgrade pip wheel
pip install -r requirements-lint.txt
python -m pip install $(sed -n 's/.*"\(pip==\([^"]*\)\)".*/\1/p' pyproject.toml)
pip install $(sed -n 's/.*"\(wheel==\([^"]*\)\)".*/\1/p' pyproject.toml)
pip install $(sed -n 's/.*"\(pre-commit==\([^"]*\)\)".*/\1/p' pyproject.toml)
- run: ./scripts/generate-license-data
- name: Update renovate branch
if: github.ref != 'refs/heads/main'
Expand Down
15 changes: 6 additions & 9 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,14 @@ 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
runs-on: macos-14
env:
PYTHONUNBUFFERED: 1
PYTHONWARNINGS: default,ignore:unclosed:ResourceWarning
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
HOMEBREW_NO_INSTALL_UPGRADE: 1
steps:
- uses: actions/checkout@v4
- run: brew update
- run: brew upgrade
- run: brew list --versions
- run: brew deps --tree --installed
- name: Fix Python
Expand All @@ -37,14 +36,12 @@ jobs:
brew unlink [email protected]
rm -f /usr/local/bin/{2to3,idle3,pydoc3,python3,python3-config}
brew link --overwrite [email protected]
- name: Fix OpenSSL
# Pulls fix from https://github.com/Homebrew/homebrew-core/pull/169721
run: brew reinstall openssl@3
- name: Install brew dependencies
run: |
# Workaround for https://github.com/xmlsec/python-xmlsec/issues/254
wget -O /tmp/libxmlsec1.rb https://raw.githubusercontent.com/Homebrew/homebrew-core/7f35e6ede954326a10949891af2dba47bbe1fc17/Formula/libxmlsec1.rb
brew install --formula /tmp/libxmlsec1.rb
brew pin libxmlsec1
brew install python pango cairo gobject-introspection glib libyaml pkg-config zstd xxhash
brew install python pango cairo gobject-introspection glib libyaml pkg-config zstd xxhash libxmlsec1
- name: Install Weblate
run: |
python3 -m venv .venv
Expand Down
14 changes: 11 additions & 3 deletions .github/workflows/migrations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,24 @@ jobs:
- name: Set up Python 3.11
uses: actions/setup-python@v5
with:
python-version: |-
3.11
python-version: 3.11
cache: pip
cache-dependency-path: '**/requirements*.txt'
- name: Install pip dependencies
run: ./ci/pip-install migrations
- name: Check missing migrations
run: ./ci/run-checkmigrate
- name: Migrate from 5.0
run: ./ci/run-migrate 5.0.2
- name: Migrate from 5.1
run: ./ci/run-migrate 5.1.1
- name: Migrate from 5.2
run: ./ci/run-migrate 5.2.1
- name: Migrate from 5.3
run: ./ci/run-migrate 5.3.1
- name: Migrate from 5.4
run: ./ci/run-migrate 5.4.3
- name: Migrate from 5.5
run: ./ci/run-migrate 5.5
- name: Coverage
run: |
coverage combine
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/mypy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ jobs:
with:
python-version: '3.11'
cache: pip
cache-dependency-path: requirements*.txt
- name: Install dependencies
run: ./ci/pip-install mypy

Expand Down
9 changes: 3 additions & 6 deletions .github/workflows/pylint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,11 @@ jobs:
with:
python-version: '3.11'
cache: pip
cache-dependency-path: |
requirements-lint.txt
requirements-ci.txt
- name: Install dependencies
run: |
pip install -r requirements-ci.txt
pip install -r requirements-lint.txt
python -m pip install $(sed -n 's/.*"\(pip==\([^"]*\)\)".*/\1/p' pyproject.toml)
pip install $(sed -n 's/.*"\(wheel==\([^"]*\)\)".*/\1/p' pyproject.toml)
pip install $(sed -n 's/.*"\(pylint==\([^"]*\)\)".*/\1/p' pyproject.toml)
- name: Add pylint annotator
uses: pr-annotators/[email protected]

Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/schema-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
- main
paths:
- .github/workflows/schema-update.yml
- requirements.txt
- pyproject.toml
- docs/Makefile

jobs:
Expand All @@ -23,12 +23,17 @@ jobs:
pull-requests: write

steps:
- uses: actions/[email protected].1
- uses: actions/[email protected].5
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: '3.11'
- run: pip install $(grep -E '^(weblate-schemas)==' requirements.txt) -r requirements-lint.txt
- name: Install pip dependencies
run: |
python -m pip install $(sed -n 's/.*"\(pip==\([^"]*\)\)".*/\1/p' pyproject.toml)
pip install $(sed -n 's/.*"\(wheel==\([^"]*\)\)".*/\1/p' pyproject.toml)
pip install $(sed -n 's/.*"\(weblate-schemas==\([^"]*\)\)".*/\1/p' pyproject.toml)
pip install $(sed -n 's/.*"\(pre-commit==\([^"]*\)\)".*/\1/p' pyproject.toml)
- run: make -C docs update-schemas
- run: pre-commit run --files $(git diff --name-only)
continue-on-error: true
Expand Down
8 changes: 4 additions & 4 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/[email protected].1
uses: actions/[email protected].5
with:
persist-credentials: false

- name: Run analysis
uses: ossf/[email protected].1
uses: ossf/[email protected].3
with:
results_file: results.sarif
results_format: sarif
Expand All @@ -53,14 +53,14 @@ jobs:
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
# format to the repository Actions tab.
- name: Upload artifact
uses: actions/[email protected].1
uses: actions/[email protected].3
with:
name: SARIF file
path: results.sarif
retention-days: 5

# Upload the results to GitHub's code scanning dashboard.
- name: Upload to code-scanning
uses: github/codeql-action/upload-sarif@v3.24.1
uses: github/codeql-action/upload-sarif@v3.25.4
with:
sarif_file: results.sarif
9 changes: 5 additions & 4 deletions .github/workflows/setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ jobs:
with:
python-version: '3.11'
cache: pip
cache-dependency-path: requirements*.txt
- name: Used versions
run: ./ci/print-versions
- name: Install pip dependencies
Expand Down Expand Up @@ -69,7 +68,6 @@ jobs:
with:
python-version: '3.11'
cache: pip
cache-dependency-path: '**/requirements*.txt'
- name: Used versions
run: ./ci/print-versions
- name: Install pip dependencies
Expand All @@ -95,9 +93,12 @@ jobs:
with:
python-version: '3.11'
cache: pip
cache-dependency-path: requirements-ci.txt
- name: Install pip dependencies
run: pip install -r requirements-ci.txt
run: |
python -m pip install $(sed -n 's/.*"\(pip==\([^"]*\)\)".*/\1/p' pyproject.toml)
pip install $(sed -n 's/.*"\(wheel==\([^"]*\)\)".*/\1/p' pyproject.toml)
pip install $(sed -n 's/.*"\(twine==\([^"]*\)\)".*/\1/p' pyproject.toml)
pip install $(sed -n 's/.*"\(build==\([^"]*\)\)".*/\1/p' pyproject.toml)
- name: build
run: python -m build
- name: Twine check
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ jobs:
strategy:
matrix:
python-version:
- '3.9'
- '3.10'
- '3.11'
- '3.12'
Expand All @@ -40,7 +39,7 @@ jobs:
requirements: latest
database: mariadb
# Reduced testing for minimal deps
- python-version: 3.9
- python-version: '3.10'
requirements: minimal
database: postgresql
# Reduced testing for edge deps
Expand Down Expand Up @@ -70,7 +69,6 @@ jobs:
with:
python-version: ${{ matrix.python-version }}
cache: pip
cache-dependency-path: '**/requirements*.txt'
- name: Used versions
run: ./ci/print-versions
- name: Install pip dependencies
Expand Down
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,5 @@ weblate-*.tar.*
/dev-docker/data/
/dev-docker/weblate-dev/requirements.txt
*~
# Generated minimal deps
requirements-min.txt
/.dmypy.json
/fil-result/
Loading

0 comments on commit e511555

Please sign in to comment.