Skip to content

Commit

Permalink
Merge branch 'master' into 2d-interpolation
Browse files Browse the repository at this point in the history
  • Loading branch information
lachlangrose authored Mar 4, 2024
2 parents 74782b4 + a76e718 commit afc073d
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/release-please.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: conda-incubator/setup-miniconda@v3

with:
python-version: ${{ matrix.python }}
- name: Installing dependencies
Expand Down Expand Up @@ -70,7 +71,7 @@ jobs:
with:
release-type: python
package-name: LoopStructural
#version-file: LoopStructural/version.py
version-file: LoopStructural/version.py
outputs:
release_created: ${{ steps.release.outputs.release_created }}
# if a release is created then run the deploy scripts for github.io, conda, pypi and docker
Expand Down Expand Up @@ -122,7 +123,7 @@ jobs:
- name: upload artifacts
uses: actions/upload-artifact@v4
with:
name: conda
name: conda-${{ matrix.os }}-${{ matrix.python-version }}
path: conda

make_sdist:
Expand Down Expand Up @@ -158,7 +159,6 @@ jobs:
path: dist
- uses: actions/download-artifact@v4
with:
name: conda
path: conda
- uses: pypa/gh-action-pypi-publish@v1
with:
Expand Down
1 change: 1 addition & 0 deletions LoopStructural/interpolators/_discrete_interpolator.py
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ def add_gradient_orthogonal_constraints(
):
pass


def calculate_residual_for_constraints(self):
"""Calculates Ax-B for all constraints added to the interpolator
This could be a proxy to identify which constraints are controlling the model
Expand Down
3 changes: 3 additions & 0 deletions LoopStructural/interpolators/supports/_2d_structured_grid.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
"""


import logging

import logging
from typing import Tuple
import numpy as np
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Documentation = 'https://Loop3d.org/LoopStructural/'
version = { attr = 'LoopStructural.version.__version__' }

[tool.setuptools.packages.find]
include = ['LoopStructural']
include = ['LoopStructural', 'LoopStructural/*']

[tool.setuptools.package-data]
LoopStructural = [
Expand Down

0 comments on commit afc073d

Please sign in to comment.