Skip to content

Commit 3a7d63d

Browse files
authored
Merge pull request #347 from FAIRmat-NFDI/uv-compile-and-install
Switch to uv compile and install
2 parents 89bc16c + 9837ec7 commit 3a7d63d

File tree

7 files changed

+30
-49
lines changed

7 files changed

+30
-49
lines changed

.github/workflows/build_docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ jobs:
3434
3535
- name: Install Dependencies
3636
run: |
37-
python -m pip install --upgrade pip
38-
pip install ".[docs]"
37+
curl -LsSf https://astral.sh/uv/install.sh | sh
38+
uv pip install --system ".[docs]"
3939
4040
- name: Build and Deploy
4141
run: |

.github/workflows/plugin_test.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ jobs:
4949
python-version: 3.9
5050
- name: Install dependencies
5151
run: |
52-
python -m pip install --upgrade pip
53-
python -m pip install coverage coveralls
52+
curl -LsSf https://astral.sh/uv/install.sh | sh
53+
uv pip install --system coverage coveralls
5454
- name: Install package
5555
run: |
56-
pip install ".[dev]"
56+
uv pip install --system ".[dev]"
5757
- name: Clone ${{ matrix.plugin }} repo
5858
uses: actions/checkout@v4
5959
with:
@@ -63,8 +63,8 @@ jobs:
6363
ref: ${{ matrix.branch }}
6464
- name: Install ${{ matrix.plugin }}
6565
run: |
66-
cd ${{ matrix.plugin }}
67-
pip install .
66+
cd ${{ matrix.plugin }}
67+
uv pip install --system .
6868
- name: Run ${{ matrix.plugin }} tests
6969
run: |
7070
cd ${{ matrix.plugin }}

.github/workflows/publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ jobs:
2727
python-version: "3.x"
2828
- name: Install dependencies
2929
run: |
30-
python -m pip install --upgrade pip
31-
pip install build
30+
curl -LsSf https://astral.sh/uv/install.sh | sh
31+
uv pip install --system build
3232
- name: Build package
3333
run: python -m build
3434
- name: Publish package

.github/workflows/pylint.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ jobs:
1515
run: |
1616
git submodule sync --recursive
1717
git submodule update --init --recursive --jobs=4
18-
python -m pip install --upgrade pip
18+
curl -LsSf https://astral.sh/uv/install.sh | sh
1919
- name: Install package
2020
run: |
21-
python -m pip install --no-deps .
21+
uv pip install --system --no-deps .
2222
- name: Install dev requirements
2323
run: |
24-
python -m pip install -r dev-requirements.txt
24+
uv pip install --system -r dev-requirements.txt
2525
- name: ruff
2626
run: |
2727
ruff src/pynxtools tests

.github/workflows/pytest.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ jobs:
2828
python-version: ${{ matrix.python_version }}
2929
- name: Install dependencies
3030
run: |
31-
python -m pip install --upgrade pip
32-
python -m pip install coverage coveralls
31+
curl -LsSf https://astral.sh/uv/install.sh | sh
32+
uv pip install --system coverage coveralls
3333
- name: Install package
3434
run: |
35-
pip install ".[dev]"
35+
uv pip install --system ".[dev]"
3636
- name: Test with pytest
3737
run: |
3838
coverage run -m pytest -sv --show-capture=no tests

dev-requirements.txt

Lines changed: 13 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
1-
#
2-
# This file is autogenerated by pip-compile with Python 3.10
3-
# by the following command:
4-
#
5-
# pip-compile --extra=dev --extra=docs --output-file=dev-requirements.txt pyproject.toml
6-
#
1+
# This file was autogenerated by uv via the following command:
2+
# uv pip compile --extra=dev --extra=docs --output-file=dev-requirements.txt pyproject.toml
73
anytree==2.12.1
84
# via pynxtools (pyproject.toml)
95
ase==3.22.1
106
# via pynxtools (pyproject.toml)
117
babel==2.14.0
128
# via mkdocs-material
13-
build==1.1.1
14-
# via pip-tools
159
certifi==2024.2.2
1610
# via requests
1711
cfgv==3.4.0
@@ -20,23 +14,21 @@ charset-normalizer==3.3.2
2014
# via requests
2115
click==8.1.7
2216
# via
17+
# pynxtools (pyproject.toml)
2318
# click-default-group
2419
# mkdocs
2520
# mkdocs-click
26-
# pip-tools
27-
# pynxtools (pyproject.toml)
2821
click-default-group==1.2.4
2922
# via pynxtools (pyproject.toml)
3023
colorama==0.4.6
3124
# via
32-
# build
3325
# click
3426
# mkdocs
3527
# mkdocs-material
3628
# pytest
3729
contourpy==1.2.0
3830
# via matplotlib
39-
coverage[toml]==7.4.4
31+
coverage==7.4.4
4032
# via pytest-cov
4133
cycler==0.12.1
4234
# via matplotlib
@@ -83,13 +75,13 @@ matplotlib==3.8.3
8375
# via ase
8476
mergedeep==1.3.4
8577
# via
86-
# mkdocs
8778
# pynxtools (pyproject.toml)
79+
# mkdocs
8880
mkdocs==1.5.3
8981
# via
82+
# pynxtools (pyproject.toml)
9083
# mkdocs-macros-plugin
9184
# mkdocs-material
92-
# pynxtools (pyproject.toml)
9385
mkdocs-click==0.8.1
9486
# via pynxtools (pyproject.toml)
9587
mkdocs-macros-plugin==1.0.5
@@ -98,8 +90,8 @@ mkdocs-material==9.5.15
9890
# via pynxtools (pyproject.toml)
9991
mkdocs-material-extensions==1.3.1
10092
# via
101-
# mkdocs-material
10293
# pynxtools (pyproject.toml)
94+
# mkdocs-material
10395
mypy==1.9.0
10496
# via pynxtools (pyproject.toml)
10597
mypy-extensions==1.0.0
@@ -108,17 +100,16 @@ nodeenv==1.8.0
108100
# via pre-commit
109101
numpy==1.26.4
110102
# via
103+
# pynxtools (pyproject.toml)
111104
# ase
112105
# contourpy
113106
# h5py
114107
# matplotlib
115108
# pandas
116-
# pynxtools (pyproject.toml)
117109
# scipy
118110
# xarray
119111
packaging==24.0
120112
# via
121-
# build
122113
# matplotlib
123114
# mkdocs
124115
# pytest
@@ -133,8 +124,6 @@ pathspec==0.12.1
133124
# via mkdocs
134125
pillow==10.2.0
135126
# via matplotlib
136-
pip-tools==7.4.1
137-
# via pynxtools (pyproject.toml)
138127
platformdirs==4.2.0
139128
# via
140129
# mkdocs
@@ -149,10 +138,6 @@ pymdown-extensions==10.7.1
149138
# via mkdocs-material
150139
pyparsing==3.1.2
151140
# via matplotlib
152-
pyproject-hooks==1.0.0
153-
# via
154-
# build
155-
# pip-tools
156141
pytest==8.1.1
157142
# via
158143
# pynxtools (pyproject.toml)
@@ -172,11 +157,11 @@ pytz==2024.1
172157
# via pandas
173158
pyyaml==6.0.1
174159
# via
160+
# pynxtools (pyproject.toml)
175161
# mkdocs
176162
# mkdocs-macros-plugin
177163
# pre-commit
178164
# pymdown-extensions
179-
# pynxtools (pyproject.toml)
180165
# pyyaml-env-tag
181166
pyyaml-env-tag==0.1
182167
# via mkdocs
@@ -188,6 +173,8 @@ ruff==0.3.4
188173
# via pynxtools (pyproject.toml)
189174
scipy==1.12.0
190175
# via ase
176+
setuptools==70.0.0
177+
# via nodeenv
191178
six==1.16.0
192179
# via
193180
# anytree
@@ -198,11 +185,8 @@ termcolor==2.4.0
198185
# via mkdocs-macros-plugin
199186
tomli==2.0.1
200187
# via
201-
# build
202188
# coverage
203189
# mypy
204-
# pip-tools
205-
# pyproject-hooks
206190
# pytest
207191
types-pytz==2024.1.0.20240203
208192
# via pynxtools (pyproject.toml)
@@ -218,17 +202,13 @@ urllib3==2.2.1
218202
# via
219203
# requests
220204
# types-requests
205+
uv==0.2.9
206+
# via pynxtools (pyproject.toml)
221207
virtualenv==20.25.1
222208
# via pre-commit
223209
watchdog==4.0.0
224210
# via mkdocs
225-
wheel==0.43.0
226-
# via pip-tools
227211
xarray==2024.2.0
228212
# via pynxtools (pyproject.toml)
229213
zipp==3.18.1
230214
# via importlib-metadata
231-
232-
# The following packages are considered to be unsafe in a requirements file:
233-
# pip
234-
# setuptools

pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ dependencies = [
3535
"importlib-metadata",
3636
"lxml>=4.9.1",
3737
"anytree",
38+
"setuptools>=64.0.1"
3839
]
3940

4041
[project.urls]
@@ -59,7 +60,7 @@ dev = [
5960
"types-pyyaml",
6061
"types-pytz",
6162
"types-requests",
62-
"pip-tools",
63+
"uv",
6364
"pre-commit",
6465
]
6566
convert = [

0 commit comments

Comments
 (0)