diff -Nru ufl-2022.2.0+legacy20230618.20a231f/.github/workflows/fenicsx-tests.yml ufl-2022.3.0/.github/workflows/fenicsx-tests.yml --- ufl-2022.2.0+legacy20230618.20a231f/.github/workflows/fenicsx-tests.yml 2023-06-18 10:52:16.000000000 +0000 +++ ufl-2022.3.0/.github/workflows/fenicsx-tests.yml 1970-01-01 00:00:00.000000000 +0000 @@ -1,97 +0,0 @@ -# This workflow will install Basix, FFCx, DOLFINx and run the DOLFINx and FFCx unit tests. - -name: FEniCSx integration - -on: - pull_request: - branches: - - main - -jobs: - ffcx-tests: - name: Run FFCx tests - runs-on: ubuntu-latest - - env: - CC: gcc-10 - CXX: g++-10 - - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v2 - with: - python-version: 3.9 - - - name: Install test dependencies - run: | - sudo apt-get install -y graphviz libgraphviz-dev ninja-build pkg-config - - - name: Install UFL - run: | - pip3 install . - - - name: Install Basix - run: | - python3 -m pip install git+https://github.com/FEniCS/basix.git - - - name: Clone FFCx - uses: actions/checkout@v2 - with: - path: ./ffcx - repository: FEniCS/ffcx - ref: main - - name: Install FFCx - run: | - cd ffcx - pip install .[ci] - - name: Run FFCx unit tests - run: python3 -m pytest -n auto ffcx/test - - dolfinx-tests: - name: Run DOLFINx tests - runs-on: ubuntu-latest - container: fenicsproject/test-env:nightly-openmpi - - env: - CC: clang - CXX: clang++ - - PETSC_ARCH: linux-gnu-complex-32 - OMPI_ALLOW_RUN_AS_ROOT: 1 - OMPI_ALLOW_RUN_AS_ROOT_CONFIRM: 1 - OMPI_MCA_rmaps_base_oversubscribe: 1 - OMPI_MCA_plm: isolated - OMPI_MCA_btl_vader_single_copy_mechanism: none - OMPI_MCA_mpi_yield_when_idle: 1 - OMPI_MCA_hwloc_base_binding_policy: none - - steps: - - uses: actions/checkout@v2 - - name: Install dependencies (Python) - run: | - python3 -m pip install --upgrade pip - - - name: Install UFL - run: | - pip3 install . - - - name: Install Basix and FFCx - run: | - python3 -m pip install git+https://github.com/FEniCS/basix.git - python3 -m pip install git+https://github.com/FEniCS/ffcx.git - - - name: Clone DOLFINx - uses: actions/checkout@v2 - with: - path: ./dolfinx - repository: FEniCS/dolfinx - ref: main - - name: Install DOLFINx - run: | - cmake -G Ninja -DCMAKE_BUILD_TYPE=Developer -B build -S dolfinx/cpp/ - cmake --build build - cmake --install build - pip3 -v install --global-option build --global-option --debug dolfinx/python/ - - name: Run DOLFINx unit tests - run: python3 -m pytest -n auto dolfinx/python/test/unit diff -Nru ufl-2022.2.0+legacy20230618.20a231f/.github/workflows/pythonapp.yml ufl-2022.3.0/.github/workflows/pythonapp.yml --- ufl-2022.2.0+legacy20230618.20a231f/.github/workflows/pythonapp.yml 2023-06-18 10:52:16.000000000 +0000 +++ ufl-2022.3.0/.github/workflows/pythonapp.yml 2023-11-13 10:10:40.000000000 +0000 @@ -28,62 +28,13 @@ uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} - - name: Lint with flake8 - run: | - python -m pip install flake8 - flake8 --statistics . - - name: Check documentation style - run: | - python -m pip install pydocstyle - python -m pydocstyle . - name: Install UFL run: python -m pip install .[ci] - name: Run unit tests run: | - python -m 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 - + python -m pytest -n auto test/ + - name: Build documentation run: | cd doc/sphinx make html - - - name: Upload documentation artifact - uses: actions/upload-artifact@v2 - with: - name: doc-${{ matrix.os }}-${{ matrix.python-version }} - path: doc/sphinx/build/html/ - retention-days: 2 - if-no-files-found: error - - - name: Checkout FEniCS/docs - if: ${{ github.repository == 'FEniCS/ufl' && ( github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/') ) && runner.os == 'Linux' && matrix.python-version == 3.8 }} - uses: actions/checkout@v2 - with: - repository: "FEniCS/docs" - path: "docs" - ssh-key: "${{ secrets.SSH_GITHUB_DOCS_PRIVATE_KEY }}" - - name: Set version name - if: ${{ github.repository == 'FEniCS/ufl' && ( github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/') ) && runner.os == 'Linux' && matrix.python-version == 3.8 }} - run: | - echo "VERSION_NAME=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV - - name: Copy documentation into repository - if: ${{ github.repository == 'FEniCS/ufl' && ( github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/') ) && runner.os == 'Linux' && matrix.python-version == 3.8 }} - run: | - cd docs - git rm -r --ignore-unmatch ufl/${{ env.VERSION_NAME }} - mkdir -p ufl/${{ env.VERSION_NAME }} - cp -r ../doc/sphinx/build/html/* ufl/${{ env.VERSION_NAME }} - - name: Commit and push documentation to FEniCS/docs - if: ${{ github.repository == 'FEniCS/ufl' && ( github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/') ) && runner.os == 'Linux' && matrix.python-version == 3.8 }} - run: | - cd docs - git config --global user.email "fenics@github.com" - git config --global user.name "FEniCS GitHub Actions" - git add --all - git commit --allow-empty -m "Python FEniCS/ufl@${{ github.sha }}" - git push diff -Nru ufl-2022.2.0+legacy20230618.20a231f/README.md ufl-2022.3.0/README.md --- ufl-2022.2.0+legacy20230618.20a231f/README.md 1970-01-01 00:00:00.000000000 +0000 +++ ufl-2022.3.0/README.md 2023-11-13 10:10:40.000000000 +0000 @@ -0,0 +1,34 @@ +# UFL legacy - Unified Form Language + +This is an archive of a legacy version of UFL that is the final version that can +be used with legacy FEniCS. It can be installed with: + +```bash +pip install fenics-ufl-legacy +``` + +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. + +UFL is part of the FEniCS Project. For more information, visit +https://www.fenicsproject.org + +## Documentation +Documentation can be viewed at https://fenics-ufl.readthedocs.org/. + +## License +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Lesser General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +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 . diff -Nru ufl-2022.2.0+legacy20230618.20a231f/README.rst ufl-2022.3.0/README.rst --- ufl-2022.2.0+legacy20230618.20a231f/README.rst 2023-06-18 10:52:16.000000000 +0000 +++ ufl-2022.3.0/README.rst 1970-01-01 00:00:00.000000000 +0000 @@ -1,42 +0,0 @@ -=========================== -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. - -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: https://fenics.readthedocs.io/projects/ufl/en/latest/?badge=latest - :alt: Documentation Status - -Documentation -============= - -Documentation can be viewed at https://fenics-ufl.readthedocs.org/. - -License -======= - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - 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 . diff -Nru ufl-2022.2.0+legacy20230618.20a231f/debian/changelog ufl-2022.3.0/debian/changelog --- ufl-2022.2.0+legacy20230618.20a231f/debian/changelog 2023-06-24 11:39:58.000000000 +0000 +++ ufl-2022.3.0/debian/changelog 2023-11-13 20:32:30.000000000 +0000 @@ -1,3 +1,12 @@ +ufl (1:2022.3.0-1) unstable; urgency=medium + + * New upstream release. Final legacy release. + * update upstream source URL to https://github.com/FEniCS/ufl-legacy + * upstream README.rst changed to README.md + * dh_clean removes generated api-doc folder. Closes: #1045491. + + -- Drew Parsons Mon, 13 Nov 2023 21:32:30 +0100 + ufl (1:2022.2.0+legacy20230618.20a231f-1) unstable; urgency=medium * snapshot of upstream ufl_legacy branch diff -Nru ufl-2022.2.0+legacy20230618.20a231f/debian/copyright ufl-2022.3.0/debian/copyright --- ufl-2022.2.0+legacy20230618.20a231f/debian/copyright 2023-06-24 11:39:58.000000000 +0000 +++ ufl-2022.3.0/debian/copyright 2023-11-13 20:32:30.000000000 +0000 @@ -2,7 +2,7 @@ Upstream-Name: ufl_legacy Upstream-Contact: ufl@lists.launchpad.net http://fenicsproject.org -Source: https://github.com/FEniCS/ufl/tree/ufl_legacy +Source: https://github.com/FEniCS/ufl-legacy Files: * Copyright: 2008-2016, Martin Sandve Alnes diff -Nru ufl-2022.2.0+legacy20230618.20a231f/debian/docs ufl-2022.3.0/debian/docs --- ufl-2022.2.0+legacy20230618.20a231f/debian/docs 2023-06-24 11:39:58.000000000 +0000 +++ ufl-2022.3.0/debian/docs 2023-11-13 20:32:30.000000000 +0000 @@ -1,2 +1,2 @@ -README.rst +README.md debian/README.Debian diff -Nru ufl-2022.2.0+legacy20230618.20a231f/debian/rules ufl-2022.3.0/debian/rules --- ufl-2022.2.0+legacy20230618.20a231f/debian/rules 2023-06-24 11:39:58.000000000 +0000 +++ ufl-2022.3.0/debian/rules 2023-11-13 20:32:30.000000000 +0000 @@ -14,9 +14,9 @@ %: dh $@ --with python3,sphinxdoc --buildsystem=pybuild -override_dh_clean: - dh_clean +execute_after_dh_clean: rm -rf *.egg-info + rm -rf doc/sphinx/source/api-doc ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS))) execute_after_dh_auto_clean: diff -Nru ufl-2022.2.0+legacy20230618.20a231f/debian/watch ufl-2022.3.0/debian/watch --- ufl-2022.2.0+legacy20230618.20a231f/debian/watch 2023-06-24 11:39:58.000000000 +0000 +++ ufl-2022.3.0/debian/watch 2023-11-13 20:32:30.000000000 +0000 @@ -1,4 +1,4 @@ version=4 opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%ufl-$1.tar.gz%" \ - https://github.com/FEniCS/ufl/tags \ + https://github.com/FEniCS/ufl-legacy/tags \ (?:.*?/)?v?(2022[\d.]*)\.tar\.gz debian uupdate