Skip to content

Commit

Permalink
Merge pull request #198 from projectfluent/version-updates
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
eemeli authored Mar 18, 2024
2 parents f9a76cb + 5661358 commit bbb0b86
Show file tree
Hide file tree
Showing 23 changed files with 191 additions and 289 deletions.
4 changes: 4 additions & 0 deletions .flake8
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[flake8]
exclude=.tox
extend-ignore = E203
max-line-length=120
61 changes: 61 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
name: CI

on:
push:
branches:
- main
pull_request:

jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
cache: pip
cache-dependency-path: |
dev-requirements.txt
fluent.syntax/setup.py
fluent.runtime/setup.py
- run: python -m pip install -r dev-requirements.txt
- run: python -m pip install ./fluent.syntax ./fluent.runtime
- run: python -m flake8
- run: python -m mypy fluent.syntax/fluent fluent.runtime/fluent
test:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.7, 3.8, 3.9, "3.10", 3.11, 3.12, pypy3.9, pypy3.10]
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
cache: pip
cache-dependency-path: |
fluent.syntax/setup.py
fluent.runtime/setup.py
- run: python -m pip install ./fluent.syntax ./fluent.runtime
- run: python -m unittest discover -s fluent.syntax
- run: python -m unittest discover -s fluent.runtime

# Test compatibility with the oldest Python version we claim to support,
# and for fluent.runtime's compatibility with a range of fluent.syntax versions.
compatibility:
runs-on: ubuntu-20.04 # https://github.com/actions/setup-python/issues/544
strategy:
matrix:
fluent-syntax:
- ./fluent.syntax
- fluent.syntax==0.19.0
- fluent.syntax==0.18.1 six
- fluent.syntax==0.17.0 six
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: 3.6
- run: python -m pip install ${{ matrix.fluent-syntax }}
- run: python -m pip install ./fluent.runtime
- run: python -m unittest discover -s fluent.runtime
18 changes: 7 additions & 11 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,18 @@ jobs:
name: build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: 3.7
python-version: 3.9
- name: Install dependencies
run: |
pip install -r docs/requirements.txt
pip install ./fluent.docs
- name: sphinx-build
run: |
./scripts/build-docs python-fluent
- name: artifact
uses: actions/upload-artifact@v3
- run: ./scripts/build-docs python-fluent
- uses: actions/upload-artifact@v4
with:
name: html
path: |
Expand All @@ -52,9 +49,8 @@ jobs:
needs: [build]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Download artifact
uses: actions/download-artifact@v3
- uses: actions/checkout@v4
- uses: actions/download-artifact@v4
with:
name: html
path: _build
Expand Down
48 changes: 0 additions & 48 deletions .github/workflows/fluent.integration.yml

This file was deleted.

73 changes: 0 additions & 73 deletions .github/workflows/fluent.runtime.yml

This file was deleted.

63 changes: 0 additions & 63 deletions .github/workflows/fluent.syntax.yml

This file was deleted.

7 changes: 7 additions & 0 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
black ~= 24.0
flake8 ~= 7.0
isort ~= 5.0
mypy ~= 1.0
tox ~= 4.0
types-babel
types-pytz
3 changes: 3 additions & 0 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,16 @@
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']


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


def add_templates(app, config):
config.templates_path.insert(0, f'{app.srcdir}/_templates')


# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
# This pattern also affects html_static_path and html_extra_path.
Expand Down
Loading

0 comments on commit bbb0b86

Please sign in to comment.