Skip to content

Commit

Permalink
CI updates (#31)
Browse files Browse the repository at this point in the history
* CI updates

* Install xdist

* Remove CircleCI file

* Trigger CI
  • Loading branch information
garth-wells committed Jun 10, 2020
1 parent dd1bf24 commit 3492e72
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 67 deletions.
28 changes: 0 additions & 28 deletions .circleci/config.yml

This file was deleted.

15 changes: 10 additions & 5 deletions .github/workflows/pythonapp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# with a single version of Python For more information see:
# https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions

name: UFL
name: UFL CI

on: [push, pull_request]

Expand All @@ -17,7 +17,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v1
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Lint with flake8
Expand All @@ -30,7 +30,12 @@ jobs:
python -m pydocstyle .
- name: Install UFL
run: pip install .
- name: Test with pytest
- name: Run unit tests
run: |
pip install pytest
pytest test/
pip install coveralls coverage pytest pytest-cov pytest-xdist
pytest -n auto --cov=ufl/ --junitxml=junit/test-results-${{ matrix.os }}-${{ matrix.python-version }}.xml test/
- name: Upload to Coveralls
if: ${{ github.repository == 'FEniCS/ufl' && github.head_ref == '' && matrix.os == 'ubuntu-latest' && matrix.python-version == '3.8' }}
env:
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
run: coveralls
49 changes: 15 additions & 34 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,46 +3,27 @@ UFL - Unified Form Language
===========================

The Unified Form Language (UFL) is a domain specific language for
declaration of finite element discretizations of variational
forms. More precisely, it defines a flexible interface for choosing
finite element spaces and defining expressions for weak forms in a
notation close to mathematical notation.
declaration of finite element discretizations of variational forms. More
precisely, it defines a flexible interface for choosing finite element
spaces and defining expressions for weak forms in a notation close to
mathematical notation.

UFL is part of the FEniCS Project.

For more information, visit http://www.fenicsproject.org


Documentation
=============

Documentation can be viewed at http://fenics-ufl.readthedocs.org/.
UFL is part of the FEniCS Project. For more information, visit
https://www.fenicsproject.org

.. image:: https://github.com/FEniCS/ufl/workflows/UFL%20CI/badge.svg
:target: https://github.com/FEniCS/ufl/workflows/UFL%20CI
.. image:: https://coveralls.io/repos/github/FEniCS/ufl/badge.svg?branch=master
:target: https://coveralls.io/github/FEniCS/ufl?branch=master
:alt: Coverage Status
.. image:: https://readthedocs.org/projects/fenics-ufl/badge/?version=latest
:target: http://fenics.readthedocs.io/projects/ufl/en/latest/?badge=latest
:target: https://fenics.readthedocs.io/projects/ufl/en/latest/?badge=latest
:alt: Documentation Status


Automated Testing
=================

We use CircleCI to perform automated testing.

.. image:: https://circleci.com/gh/FEniCS/ufl.svg?style=shield
:target: https://circleci.com/gh/FEniCS/ufl
:alt: Build Status


Code Coverage
Documentation
=============

Code coverage reports can be viewed at
https://coveralls.io/github/FEniCS/ufl.

.. image:: https://coveralls.io/repos/github/FEniCS/ufl/badge.svg?branch=master
:target: https://coveralls.io/github/FEniCS/ufl?branch=master
:alt: Coverage Status

Documentation can be viewed at https://fenics-ufl.readthedocs.org/.

License
=======
Expand All @@ -58,4 +39,4 @@ License
GNU Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
along with this program. If not, see <https://www.gnu.org/licenses/>.

0 comments on commit 3492e72

Please sign in to comment.