Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test Brille fix #304

Merged
merged 3 commits into from
Jul 16, 2024
Merged

Test Brille fix #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b56469f
Restore testing to macos-latest
ajjackson Jul 16, 2024
97fdf04
Suppress spglib deprecation warning from SeeK-path
ajjackson Jul 16, 2024
8dd44f2
Update changelog, remaining github workflows to mac-latest
ajjackson Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build_upload_pypi_wheels.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading