Skip to content

Commit 9cd7df8

Browse files
authored
Merge branch 'master' into type-elec-struct
2 parents 629b480 + 17f61ff commit 9cd7df8

File tree

3 files changed

+25
-2
lines changed

3 files changed

+25
-2
lines changed

.editorconfig

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# top-most EditorConfig file
2+
root = true
3+
4+
# Unix-style newlines with a newline ending every file
5+
[*]
6+
end_of_line = lf
7+
insert_final_newline = true
8+
9+
# Matches multiple files with brace expansion notation
10+
# Set default charset
11+
[*.py]
12+
charset = utf-8
13+
14+
# 4 space indentation
15+
[*.py]
16+
indent_style = space
17+
indent_size = 4
18+
19+
# Matches the exact files either package.json or .travis.yml
20+
[{*.{json,yml,yaml}]
21+
indent_style = space
22+
indent_size = 2

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
micromamba activate pmg
7878
# TODO remove temporary fix. added since uv install torch is flaky.
7979
# track https://github.com/astral-sh/uv/issues/1921 for resolution
80-
pip install torch
80+
pip install torch --upgrade
8181
8282
uv pip install numpy cython
8383
uv pip install --editable '.[${{ matrix.config.extras }}]' --resolution=${{ matrix.config.resolution }}

pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ dependencies = [
6060
"matplotlib>=3.8",
6161
"monty>=2024.5.24",
6262
"networkx>=2.2",
63-
"numpy>=1.25.0,<2.0.0",
63+
'numpy>=1.25.0,<2.0 ; platform_system == "Windows"',
64+
'numpy>=1.25.0 ; platform_system != "Windows"',
6465
"palettable>=3.1.1",
6566
"pandas>=2",
6667
"plotly>=4.5.0",

0 commit comments

Comments
 (0)