Skip to content

Commit bbb0b86

Browse files
authored
Merge pull request #198 from projectfluent/version-updates
Update dependencies
2 parents f9a76cb + 5661358 commit bbb0b86

23 files changed

+191
-289
lines changed

.flake8

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[flake8]
2+
exclude=.tox
3+
extend-ignore = E203
4+
max-line-length=120

.github/workflows/ci.yml

+61
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
8+
9+
jobs:
10+
lint:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v4
14+
- uses: actions/setup-python@v5
15+
with:
16+
cache: pip
17+
cache-dependency-path: |
18+
dev-requirements.txt
19+
fluent.syntax/setup.py
20+
fluent.runtime/setup.py
21+
- run: python -m pip install -r dev-requirements.txt
22+
- run: python -m pip install ./fluent.syntax ./fluent.runtime
23+
- run: python -m flake8
24+
- run: python -m mypy fluent.syntax/fluent fluent.runtime/fluent
25+
test:
26+
runs-on: ubuntu-latest
27+
strategy:
28+
matrix:
29+
python-version: [3.7, 3.8, 3.9, "3.10", 3.11, 3.12, pypy3.9, pypy3.10]
30+
steps:
31+
- uses: actions/checkout@v4
32+
- uses: actions/setup-python@v5
33+
with:
34+
python-version: ${{ matrix.python-version }}
35+
cache: pip
36+
cache-dependency-path: |
37+
fluent.syntax/setup.py
38+
fluent.runtime/setup.py
39+
- run: python -m pip install ./fluent.syntax ./fluent.runtime
40+
- run: python -m unittest discover -s fluent.syntax
41+
- run: python -m unittest discover -s fluent.runtime
42+
43+
# Test compatibility with the oldest Python version we claim to support,
44+
# and for fluent.runtime's compatibility with a range of fluent.syntax versions.
45+
compatibility:
46+
runs-on: ubuntu-20.04 # https://github.com/actions/setup-python/issues/544
47+
strategy:
48+
matrix:
49+
fluent-syntax:
50+
- ./fluent.syntax
51+
- fluent.syntax==0.19.0
52+
- fluent.syntax==0.18.1 six
53+
- fluent.syntax==0.17.0 six
54+
steps:
55+
- uses: actions/checkout@v3
56+
- uses: actions/setup-python@v4
57+
with:
58+
python-version: 3.6
59+
- run: python -m pip install ${{ matrix.fluent-syntax }}
60+
- run: python -m pip install ./fluent.runtime
61+
- run: python -m unittest discover -s fluent.runtime

.github/workflows/documentation.yml

+7-11
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,18 @@ jobs:
2626
name: build
2727
runs-on: ubuntu-latest
2828
steps:
29-
- uses: actions/checkout@v3
29+
- uses: actions/checkout@v4
3030
with:
3131
fetch-depth: 0
32-
- uses: actions/setup-python@v4
32+
- uses: actions/setup-python@v5
3333
with:
34-
python-version: 3.7
34+
python-version: 3.9
3535
- name: Install dependencies
3636
run: |
3737
pip install -r docs/requirements.txt
3838
pip install ./fluent.docs
39-
- name: sphinx-build
40-
run: |
41-
./scripts/build-docs python-fluent
42-
- name: artifact
43-
uses: actions/upload-artifact@v3
39+
- run: ./scripts/build-docs python-fluent
40+
- uses: actions/upload-artifact@v4
4441
with:
4542
name: html
4643
path: |
@@ -52,9 +49,8 @@ jobs:
5249
needs: [build]
5350
runs-on: ubuntu-latest
5451
steps:
55-
- uses: actions/checkout@v3
56-
- name: Download artifact
57-
uses: actions/download-artifact@v3
52+
- uses: actions/checkout@v4
53+
- uses: actions/download-artifact@v4
5854
with:
5955
name: html
6056
path: _build

.github/workflows/fluent.integration.yml

-48
This file was deleted.

.github/workflows/fluent.runtime.yml

-73
This file was deleted.

.github/workflows/fluent.syntax.yml

-63
This file was deleted.

dev-requirements.txt

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
black ~= 24.0
2+
flake8 ~= 7.0
3+
isort ~= 5.0
4+
mypy ~= 1.0
5+
tox ~= 4.0
6+
types-babel
7+
types-pytz

docs/conf.py

+3
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,16 @@
3434
# Add any paths that contain templates here, relative to this directory.
3535
templates_path = ['_templates']
3636

37+
3738
# Add src_dir/docs/_templates in a hook as we only have the src_dir then.
3839
def setup(app):
3940
app.connect('config-inited', add_templates)
4041

42+
4143
def add_templates(app, config):
4244
config.templates_path.insert(0, f'{app.srcdir}/_templates')
4345

46+
4447
# List of patterns, relative to source directory, that match files and
4548
# directories to ignore when looking for source files.
4649
# This pattern also affects html_static_path and html_extra_path.

0 commit comments

Comments
 (0)