Skip to content

Commit

Permalink
Maintenance: Brille and Spglib updates (#304)
Browse files Browse the repository at this point in the history
* Restore testing to macos-latest

* Check that Brille updates have resolved the compatibility issue with macos-latest

* Suppress spglib deprecation warning from SeeK-path

* Update changelog, remaining github workflows to mac-latest
  • Loading branch information
ajjackson authored Jul 16, 2024
1 parent 870a9ef commit da30b4d
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_upload_pypi_wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
include:
- os: windows-latest
wheelname: win
- os: macos-12
- os: macos-latest
wheelname: macos
- os: ubuntu-latest
wheelname: manylinux
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
(github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'no_ci'))
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-12]
os: [ubuntu-latest, windows-latest, macos-latest]
fail-fast: false
runs-on: ${{ matrix.os }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
test:
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-12]
os: [ubuntu-latest, windows-latest, macos-latest]
fail-fast: false
runs-on: ${{ matrix.os }}
steps:
Expand Down
6 changes: 1 addition & 5 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,7 @@
- Update reference to scipy.integrate.simpson (scipy.integrate.simps
is deprecated)

- Mac tests and builds are running against "macos-12" github runner
instead of "macos-latest", in order to test properly against
Brille. This should be restored to "macos-latest" when Brille
build system is updated and gives consistent results with
win/linux.
- Filter out spglib deprecation warnings caused by SeeK-path.

-------------------------------------------------------------------------------

Expand Down
8 changes: 7 additions & 1 deletion euphonic/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ def get_qpoint_labels(qpts: np.ndarray,
Tick labels and the q-point indices that they apply to
"""
xlabels, qpts_with_labels = _recip_space_labels(qpts, cell=cell)

for i, label in enumerate(xlabels):
if label == 'GAMMA':
xlabels[i] = r'$\Gamma$'
Expand Down Expand Up @@ -567,7 +568,12 @@ def _recip_space_labels(qpts: np.ndarray,
sym_label_to_coords = _generic_qpt_labels()
else:
try:
sym_label_to_coords = seekpath.get_path(cell)["point_coords"]
with warnings.catch_warnings():
# SeeK-path is raising spglib 2.5.0 deprecation warnings, we
# don't care to see those for now
warnings.simplefilter("ignore", category=DeprecationWarning)
sym_label_to_coords = seekpath.get_path(cell)["point_coords"]

except (SymmetryDetectionError, TypeError) as err:
if isinstance(err, TypeError):
# There is a particular TypeError we expect to see when the
Expand Down

0 comments on commit da30b4d

Please sign in to comment.