From ac50fb8145af7f06069e3ed65b272837c48f721a Mon Sep 17 00:00:00 2001 From: Lukas Pielsticker <50139597+lukaspie@users.noreply.github.com> Date: Mon, 21 Oct 2024 11:32:38 +0000 Subject: [PATCH 1/3] bump ruff to >v0.6 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 1e3b2a9..c3b61c1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -33,7 +33,7 @@ dependencies = [ [project.optional-dependencies] dev = [ "mypy", - "ruff==0.5.5", + "ruff>=0.6.0", "pytest", "types-pyyaml", "pip-tools", From e3e1cb579c47b9658831844871ac7b78a8d25507 Mon Sep 17 00:00:00 2001 From: Lukas Pielsticker <50139597+lukaspie@users.noreply.github.com> Date: Tue, 22 Oct 2024 10:41:54 +0200 Subject: [PATCH 2/3] update dev-requirements --- dev-requirements.txt | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 1398df2..3507848 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -6,6 +6,8 @@ ase==3.22.1 # via pynxtools build==1.0.3 # via pip-tools +cfgv==3.4.0 + # via pre-commit click==8.1.7 # via # click-default-group @@ -13,18 +15,27 @@ click==8.1.7 # pynxtools click-default-group==1.2.4 # via pynxtools +colorama==0.4.6 + # via + # build + # click + # pytest contourpy==1.2.0 # via matplotlib cycler==0.12.1 # via matplotlib -exceptiongroup==1.2.0 - # via pytest +distlib==0.3.9 + # via virtualenv +filelock==3.16.1 + # via virtualenv fonttools==4.49.0 # via matplotlib h5py==3.10.0 # via # pynxtools-mpes (pyproject.toml) # pynxtools +identify==2.6.1 + # via pre-commit importlib-metadata==7.0.1 # via pynxtools iniconfig==2.0.0 @@ -41,6 +52,8 @@ mypy==1.8.0 # via pynxtools-mpes (pyproject.toml) mypy-extensions==1.0.0 # via mypy +nodeenv==1.9.1 + # via pre-commit numpy==1.26.4 # via # ase @@ -67,8 +80,12 @@ pip==24.1.2 # via pip-tools pip-tools==7.4.0 # via pynxtools-mpes (pyproject.toml) +platformdirs==4.3.6 + # via virtualenv pluggy==1.4.0 # via pytest +pre-commit==4.0.1 + # via pynxtools-mpes (pyproject.toml) pynxtools==0.6.0 # via pynxtools-mpes (pyproject.toml) pyparsing==3.1.1 @@ -86,8 +103,10 @@ python-dateutil==2.8.2 pytz==2024.1 # via pandas pyyaml==6.0.1 - # via pynxtools -ruff==0.5.5 + # via + # pre-commit + # pynxtools +ruff==0.7.0 # via pynxtools-mpes (pyproject.toml) scipy==1.12.0 # via ase @@ -97,19 +116,14 @@ six==1.16.0 # via # anytree # python-dateutil -tomli==2.0.1 - # via - # build - # mypy - # pip-tools - # pyproject-hooks - # pytest types-pyyaml==6.0.12.12 # via pynxtools-mpes (pyproject.toml) typing-extensions==4.9.0 # via mypy tzdata==2024.1 # via pandas +virtualenv==20.27.0 + # via pre-commit wheel==0.42.0 # via pip-tools xarray==2024.2.0 From ee8c1447c005b9280a8f8b028a2c1eef28fb3be3 Mon Sep 17 00:00:00 2001 From: Lukas Pielsticker <50139597+lukaspie@users.noreply.github.com> Date: Tue, 22 Oct 2024 15:32:37 +0200 Subject: [PATCH 3/3] remove dev-requirements --- .github/workflows/pylint.yml | 5 +- dev-requirements.txt | 134 ----------------------------------- 2 files changed, 2 insertions(+), 137 deletions(-) delete mode 100644 dev-requirements.txt diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml index de851dc..8f9275e 100644 --- a/.github/workflows/pylint.yml +++ b/.github/workflows/pylint.yml @@ -14,11 +14,10 @@ jobs: uses: actions/setup-python@v5 with: python-version: "3.10" - - name: Install package + - name: Install package and dev dependencies run: | curl -LsSf https://astral.sh/uv/install.sh | sh - uv pip install --no-deps . - uv pip install -r dev-requirements.txt + uv pip install ".[dev]" - name: ruff check run: | ruff check src/pynxtools_mpes tests diff --git a/dev-requirements.txt b/dev-requirements.txt deleted file mode 100644 index 3507848..0000000 --- a/dev-requirements.txt +++ /dev/null @@ -1,134 +0,0 @@ -# This file was autogenerated by uv via the following command: -# uv pip compile --extra=dev --output-file=dev-requirements.txt pyproject.toml -anytree==2.12.1 - # via pynxtools -ase==3.22.1 - # via pynxtools -build==1.0.3 - # via pip-tools -cfgv==3.4.0 - # via pre-commit -click==8.1.7 - # via - # click-default-group - # pip-tools - # pynxtools -click-default-group==1.2.4 - # via pynxtools -colorama==0.4.6 - # via - # build - # click - # pytest -contourpy==1.2.0 - # via matplotlib -cycler==0.12.1 - # via matplotlib -distlib==0.3.9 - # via virtualenv -filelock==3.16.1 - # via virtualenv -fonttools==4.49.0 - # via matplotlib -h5py==3.10.0 - # via - # pynxtools-mpes (pyproject.toml) - # pynxtools -identify==2.6.1 - # via pre-commit -importlib-metadata==7.0.1 - # via pynxtools -iniconfig==2.0.0 - # via pytest -kiwisolver==1.4.5 - # via matplotlib -lxml==5.1.0 - # via pynxtools -matplotlib==3.8.3 - # via ase -mergedeep==1.3.4 - # via pynxtools -mypy==1.8.0 - # via pynxtools-mpes (pyproject.toml) -mypy-extensions==1.0.0 - # via mypy -nodeenv==1.9.1 - # via pre-commit -numpy==1.26.4 - # via - # ase - # contourpy - # h5py - # matplotlib - # pandas - # pynxtools - # scipy - # xarray -packaging==23.2 - # via - # build - # matplotlib - # pytest - # xarray -pandas==2.2.0 - # via - # pynxtools - # xarray -pillow==10.0.1 - # via matplotlib -pip==24.1.2 - # via pip-tools -pip-tools==7.4.0 - # via pynxtools-mpes (pyproject.toml) -platformdirs==4.3.6 - # via virtualenv -pluggy==1.4.0 - # via pytest -pre-commit==4.0.1 - # via pynxtools-mpes (pyproject.toml) -pynxtools==0.6.0 - # via pynxtools-mpes (pyproject.toml) -pyparsing==3.1.1 - # via matplotlib -pyproject-hooks==1.0.0 - # via - # build - # pip-tools -pytest==8.0.1 - # via pynxtools-mpes (pyproject.toml) -python-dateutil==2.8.2 - # via - # matplotlib - # pandas -pytz==2024.1 - # via pandas -pyyaml==6.0.1 - # via - # pre-commit - # pynxtools -ruff==0.7.0 - # via pynxtools-mpes (pyproject.toml) -scipy==1.12.0 - # via ase -setuptools==71.1.0 - # via pip-tools -six==1.16.0 - # via - # anytree - # python-dateutil -types-pyyaml==6.0.12.12 - # via pynxtools-mpes (pyproject.toml) -typing-extensions==4.9.0 - # via mypy -tzdata==2024.1 - # via pandas -virtualenv==20.27.0 - # via pre-commit -wheel==0.42.0 - # via pip-tools -xarray==2024.2.0 - # via - # pynxtools-mpes (pyproject.toml) - # pynxtools -zipp==3.17.0 - # via importlib-metadata