Skip to content

Commit

Permalink
Renovate CI & tools (#1028)
Browse files Browse the repository at this point in the history
* Update ruff, run autofix
* CI: Update action versions
* CI: Unify workflow files
* CI: Test on Python 3.12 too
* CI: use Ubuntu 22.04 instead of 20.04
* CI: add publish step for version tags
  • Loading branch information
akx authored Oct 1, 2023
1 parent 72bccff commit fb6ab5f
Show file tree
Hide file tree
Showing 6 changed files with 109 additions and 81 deletions.
27 changes: 0 additions & 27 deletions .github/workflows/build.yml

This file was deleted.

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/[email protected]
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
50 changes: 0 additions & 50 deletions .github/workflows/test.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.0.275
rev: v0.0.291
hooks:
- id: ruff
args:
Expand Down
4 changes: 2 additions & 2 deletions scripts/generate_authors.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def get_sorted_authors_list():
def get_authors_file_content():
author_list = "\n".join(f"- {a}" for a in get_sorted_authors_list())

return '''
return f'''
Babel is written and maintained by the Babel team and various contributors:
{author_list}
Expand All @@ -26,7 +26,7 @@ def get_authors_file_content():
In addition to the regular contributions Babel includes a fork of Lennart
Regebro's tzlocal that originally was licensed under the CC0 license. The
original copyright of that project is "Copyright 2013 by Lennart Regebro".
'''.format(author_list=author_list)
'''


def write_authors_file():
Expand Down
7 changes: 6 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
[tox]
envlist =
py{37,38,39,310,311}
py{37,38,39,310,311,312}
pypy3
py{37,38}-pytz

[testenv]
extras =
dev
deps =
# including setuptools here for CI;
# see https://github.com/python/cpython/issues/95299
# see https://github.com/python-babel/babel/issues/1005#issuecomment-1728105742
setuptools;python_version>="3.12"
backports.zoneinfo;python_version<"3.9"
tzdata;sys_platform == 'win32'
pytz: pytz
Expand All @@ -28,3 +32,4 @@ python =
3.9: py39
3.10: py310
3.11: py311
3.12: py312

0 comments on commit fb6ab5f

Please sign in to comment.