Skip to content

Commit

Permalink
Merge branch 'master' into javascript-lexer-regex-parse-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
gitaarik authored Nov 17, 2023
2 parents 4000133 + 65de3dc commit b37389a
Show file tree
Hide file tree
Showing 82 changed files with 4,796 additions and 3,694 deletions.
3 changes: 2 additions & 1 deletion .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
exclude_lines =
NotImplemented
pragma: no cover
warnings.warn
warnings.warn
if TYPE_CHECKING:
100 changes: 100 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
name: CI

on:
push:
branches:
- master
- '*-maint'
tags:
- 'v*'
pull_request:
branches:
- master
- '*-maint'

jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: pre-commit/action@v3.0.0
test:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os:
- "ubuntu-22.04"
- "windows-2022"
- "macos-11"
python-version:
- "3.7"
- "3.8"
- "3.9"
- "3.10"
- "3.11"
- "pypy-3.7"
- "3.12"
env:
BABEL_CLDR_NO_DOWNLOAD_PROGRESS: "1"
BABEL_CLDR_QUIET: "1"
steps:
- uses: actions/checkout@v4
- uses: actions/cache@v3
with:
path: cldr
key: cldr-${{ hashFiles('scripts/*cldr*') }}
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
allow-prereleases: true # For Python 3.12
cache: "pip"
cache-dependency-path: "**/setup.py"
- name: Install dependencies
run: |
python -m pip install --upgrade pip setuptools wheel
python -m pip install 'tox~=4.0' 'tox-gh-actions~=3.0'
- name: Run test via Tox
run: tox --skip-missing-interpreters
env:
COVERAGE_XML_PATH: ${{ runner.temp }}
- uses: codecov/codecov-action@v3
with:
directory: ${{ runner.temp }}
build:
runs-on: ubuntu-22.04
needs: lint
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
with:
python-version: "3.11"
cache: "pip"
cache-dependency-path: "**/setup.py"
- run: pip install build -e .
- run: make import-cldr
- run: python -m build
- uses: actions/upload-artifact@v3
with:
name: dist
path: dist
publish:
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
needs:
- build
runs-on: ubuntu-latest
environment:
name: release
url: https://pypi.org/p/babel/
permissions:
id-token: write
steps:
- uses: actions/download-artifact@v3
with:
name: dist
path: dist/
- name: Publish package distributions to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
with:
verbose: true
print-hash: true
39 changes: 0 additions & 39 deletions .github/workflows/test.yml

This file was deleted.

37 changes: 21 additions & 16 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,24 @@
- repo: https://github.com/pre-commit/pre-commit-hooks
sha: 97b88d9610bcc03982ddac33caba98bb2b751f5f
repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.0.291
hooks:
- id: autopep8-wrapper
exclude: (docs/conf.py|tests/messages/data/)
- id: check-added-large-files
- id: check-docstring-first
- id: ruff
args:
- --fix
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
hooks:
- id: check-added-large-files
- id: check-docstring-first
exclude: (docs/conf.py)
- id: check-json
- id: check-yaml
- id: debug-statements
- id: end-of-file-fixer
- id: flake8
exclude: (docs/conf.py|babel/messages/__init__.py|babel/__init__.py|tests/messages/data|scripts/import_cldr.py)
- id: name-tests-test
args: ['--django']
- id: check-json
- id: check-yaml
- id: debug-statements
exclude: (tests/messages/data/)
- id: end-of-file-fixer
exclude: (tests/messages/data/)
- id: name-tests-test
args: [ '--django' ]
exclude: (tests/messages/data/)
- id: requirements-txt-fixer
- id: trailing-whitespace
- id: requirements-txt-fixer
- id: trailing-whitespace
13 changes: 10 additions & 3 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,17 @@
version: 2

build:
os: ubuntu-20.04
os: ubuntu-22.04
tools:
python: "3.9"

python: "3.11"
jobs:
pre_build:
# Replace any Babel version something may have pulled in
# with the copy we're working on. We'll also need to build
# the data files at that point, or date formatting _within_
# Sphinx will fail.
- pip install -e .
- make import-cldr
sphinx:
configuration: docs/conf.py

Expand Down
26 changes: 24 additions & 2 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,13 @@ Babel is written and maintained by the Babel team and various contributors:
- Isaac Jurado
- Tobias Bieniek
- Erick Wilder
- Jonah Lawrence
- Michael Birtwell
- Jonas Borgström
- Kevin Deldycke
- Jon Dufresne
- Ville Skyttä
- Jon Dufresne
- Jun Omae
- Hugo
- Heungsub Lee
- Jakob Schnitzer
Expand All @@ -32,6 +34,7 @@ Babel is written and maintained by the Babel team and various contributors:
- Jennifer Wang
- Lukas Balaga
- sudheesh001
- Jean Abou Samra
- Niklas Hambüchen
- Changaco
- Xavier Fernandez
Expand All @@ -45,8 +48,27 @@ Babel is written and maintained by the Babel team and various contributors:
- Ryan J Ollos
- Arturas Moskvinas
- Leonardo Pistone
- Jun Omae
- Hyunjun Kim
- Daniel
- Oleh Prypin
- Petr Viktorin
- Jean Abou-Samra
- Joe Portela
- Marc-Etienne Vargenau
- Michał Górny
- Alex Waygood
- Maciej Olko
- martin f. krafft
- DS/Charlie
- lilinjie
- Johannes Wilm
- Eric L
- Przemyslaw Wegrzyn
- Lukas Kahwe Smith
- Lukas Juhrich
- Nikita Sobolev
- Raphael Nestler
- Frank Harrison
- Nehal J Wani
- Mohamed Morsy
- Krzysztof Jagiełło
Expand Down
Loading

0 comments on commit b37389a

Please sign in to comment.