Skip to content

Commit acbd449

Browse files
connorjwardconnorjward
authored
Merge pull request #104 from firedrakeproject/connorjward/add-finat-gem
Absorb FInAT and GEM into FIAT
2 parents b063854 + 39247cb commit acbd449

File tree

188 files changed

+16551
-84
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

188 files changed

+16551
-84
lines changed

‎.github/workflows/docs.yml

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: github pages
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
8+
jobs:
9+
build_docs:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v4
13+
- name: Setup python
14+
uses: actions/setup-python@v3
15+
with:
16+
python-version: 3.12
17+
- name: Install
18+
run: |
19+
python -m pip install .[doc]
20+
- name: Build docs
21+
run: |
22+
make -C docs html
23+
- name: Deploy
24+
uses: peaceiris/actions-gh-pages@v3
25+
with:
26+
github_token: ${{ secrets.GITHUB_TOKEN }}
27+
publish_dir: ./docs/build/html
28+
publish_branch: gh-pages
29+
enable_jekyll: false
30+
allow_empty_commit: false
31+
user_name: 'github-actions[bot]'
32+
user_email: 'github-actions[bot]@users.noreply.github.com'

‎.github/workflows/pythonapp.yml

+13-7
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,19 @@
44

55
name: FIAT CI
66

7-
on: [push, pull_request]
7+
on:
8+
push:
9+
branches:
10+
- master
11+
pull_request:
812

913
jobs:
1014
build:
1115
runs-on: ${{ matrix.os }}
1216
strategy:
1317
matrix:
1418
os: [ubuntu-latest, macos-latest]
15-
python-version: ['3.9', '3.10', '3.11', '3.12']
19+
python-version: ['3.10', '3.11', '3.12', '3.13']
1620

1721
steps:
1822
- uses: actions/checkout@v4
@@ -28,12 +32,14 @@ jobs:
2832
run: |
2933
python -m pip install pydocstyle
3034
python -m pydocstyle .
31-
- name: Install FIAT
32-
run: pip install .
33-
- name: Test with pytest
35+
- name: Install FIAT and CI dependencies
3436
run: |
35-
python -m pip install coveralls pytest pytest-cov pytest-xdist
36-
DATA_REPO_GIT="" python -m pytest --cov=FIAT/ test/
37+
python -m pip install '.[test]'
38+
python -m pip install coveralls pytest-cov
39+
- name: Test FIAT
40+
run: DATA_REPO_GIT="" python -m pytest --cov=FIAT/ test/FIAT
41+
- name: Test FInAT
42+
run: DATA_REPO_GIT="" python -m pytest --cov=finat/ --cov=gem/ test/finat
3743
- name: Coveralls
3844
if: ${{ github.repository == 'FEniCS/fiat' && github.head_ref == '' && matrix.os == 'ubuntu-latest' && matrix.python-version == '3.11' }}
3945
env:

‎.gitignore

+5-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,8 @@
88
/doc/sphinx/source/api-doc
99
release/
1010

11-
/doc/sphinx/source/_build/
11+
/docs/build/
12+
/docs/source/FIAT.rst
13+
/docs/source/finat.rst
14+
/docs/source/finat.ufl.rst
15+
/docs/source/gem.rst

‎doc/sphinx/requirements.txt

-3
This file was deleted.

‎doc/sphinx/Makefile ‎docs/Makefile

+6-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,12 @@ help:
4949
clean:
5050
rm -rf $(BUILDDIR)/*
5151

52-
html:
52+
apidoc:
53+
sphinx-apidoc -f -T -o source/ ../FIAT
54+
sphinx-apidoc -f -T -o source/ ../finat
55+
sphinx-apidoc -f -T -o source/ ../gem
56+
57+
html: apidoc
5358
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
5459
@echo
5560
@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."

‎docs/images/logo.png

60.4 KB
Loading

‎docs/images/logo.svg

+194
Loading

‎docs/source/_themes/finat/README

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
This is the Sphinx theme for the FInAT web page
2+
It was originally based on the Firedrake web page,
3+
which was based on the dolfin-adjoint theme,
4+
which was in turn based oh the FEniCS project theme.

‎docs/source/_themes/finat/layout.html

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
{% extends "basic/layout.html" %}
2+
3+
{% block extrahead %}
4+
<!--[if lte IE 6]>
5+
<link rel="stylesheet" href="{{ pathto('_static/ie6.css', 1) }}" type="text/css" media="screen" charset="utf-8" />
6+
<![endif]-->
7+
8+
<link rel="stylesheet" href="{{ pathto('_static/featured.css', 1) }}">
9+
10+
{% if theme_favicon %}
11+
<link rel="shortcut icon" href="{{ pathto('_static/'+theme_favicon, 1) }}" />
12+
{% endif %}
13+
{% endblock %}
14+
15+
{# override upper relbar to show our navigation menu #}
16+
{% block relbar1 %}
17+
<div class="wrapper">
18+
<a href="{{ pathto('index.html', 1) }}"><img src="{{ pathto('_static/%s.%s' % ('banner', 'png'), 1) }}" width="900px" alt="FInAT Project Banner" /></a>
19+
<div id="access">
20+
<div class="menu">
21+
<ul>
22+
<li class="page_item"><a href="https://github.com/FInAT/finat" title="GitHub">GitHub</a></li>
23+
<!-- <li class="page_item"><a href="{{ pathto('documentation.html', 1) }}" title="Documentation for FInAT">Documentation</a></li>
24+
<li class="page_item"><a href="{{ pathto('download.html', 1) }}" title="Obtain the FInAT code">Download</a></li>
25+
<li class="page_item"><a href="{{ pathto('%s.%s' % ('team', 'html'), 1) }}" title="The guilty parties">Team</a></li>
26+
<li class="page_item"><a href="{{ pathto('publications.html', 1) }}" title="Publications">Publications</a></li>
27+
<li class="page_item"><a href="{{ pathto('funding.html', 1) }}" title="Our financial supporters">Funding</a></li>
28+
<li class="page_item"><a href="{{ pathto('contact.html', 1) }}" title="Getting in touch">Contact</a></li>
29+
<li class="page_item"><a href="http://buildbot-ocean.ese.ic.ac.uk:8080/builders/FInAT-trunk" title="Buildbot">Buildbot</a></li>-->
30+
</ul>
31+
</div><!-- .menu -->
32+
</div><!-- #access -->
33+
</div><!-- #wrapper -->
34+
{% endblock %}
35+
36+
{# do not display lower relbar #}
37+
{% block relbar2 %}{% endblock %}
38+
39+
{# do not display sidebars #}
40+
{% block sidebar1 %}{% endblock %}
41+
{% block sidebar2 %}{% endblock %}

‎docs/source/_themes/finat/static/banner.png

152 KB
Loading

0 commit comments

Comments
 (0)