From e31aaf6ee28b81ff0f4d439f54f2c3a34131cdf1 Mon Sep 17 00:00:00 2001 From: Hsiaoming Yang Date: Mon, 20 Jan 2025 23:12:37 +0900 Subject: [PATCH] chore: use rye to track dependencies --- .github/workflows/docs.yml | 7 +--- .github/workflows/pypi.yml | 1 - .github/workflows/test.yml | 6 +-- pyproject.toml | 10 +++++ requirements-dev.lock | 42 +++++++++++++++++++ .../docs.txt => requirements-docs.txt | 0 requirements.lock | 18 ++++++++ requirements.txt | 5 --- requirements/base.txt | 2 - requirements/lint.txt | 2 - requirements/tests.txt | 3 -- 11 files changed, 74 insertions(+), 22 deletions(-) create mode 100644 requirements-dev.lock rename requirements/docs.txt => requirements-docs.txt (100%) create mode 100644 requirements.lock delete mode 100644 requirements.txt delete mode 100644 requirements/base.txt delete mode 100644 requirements/lint.txt delete mode 100644 requirements/tests.txt diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index f2e1349..cad0abe 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -31,11 +31,8 @@ jobs: - name: install dependencies run: | - pip install -r requirements/base.txt - pip install -r requirements/docs.txt - - - name: install self - run: pip install . + pip install -r requirements-dev.lock + pip install -r requirements-docs.txt - name: sphinx build run: | diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml index 7e4abf6..4faa1e8 100644 --- a/.github/workflows/pypi.yml +++ b/.github/workflows/pypi.yml @@ -6,7 +6,6 @@ permissions: on: push: tags: - - "0.*" - "1.*" jobs: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fa886ea..421ecea 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -30,8 +30,7 @@ jobs: - name: Install dependencies run: | - pip install -r requirements/base.txt - pip install -r requirements/lint.txt + pip install -r requirements-dev.lock - name: ruff lint run: ruff check @@ -58,8 +57,7 @@ jobs: - name: Install dependencies run: | - pip install -r requirements/base.txt - pip install -r requirements/tests.txt + pip install -r requirements-dev.lock - name: Report coverage run: pytest --cov=joserfc --cov-report=xml diff --git a/pyproject.toml b/pyproject.toml index 0802f96..bb2df49 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -49,6 +49,16 @@ where = ["src"] [tool.setuptools.package-data] joserfc = ["py.typed"] +[tool.rye] +managed = true +dev-dependencies = [ + "mypy>=1.14.1", + "pytest>=8.3.4", + "pytest-cov>=5.0.0", + "pycryptodome>=3.21.0", + "ruff>=0.9.2", +] + [tool.ruff] line-length = 120 diff --git a/requirements-dev.lock b/requirements-dev.lock new file mode 100644 index 0000000..ce2da4f --- /dev/null +++ b/requirements-dev.lock @@ -0,0 +1,42 @@ +# generated by rye +# use `rye lock` or `rye sync` to update this lockfile +# +# last locked with the following flags: +# pre: false +# features: [] +# all-features: false +# with-sources: false +# generate-hashes: false +# universal: false + +-e file:. +cffi==1.17.1 + # via cryptography +coverage==7.6.1 + # via pytest-cov +cryptography==44.0.0 + # via joserfc +exceptiongroup==1.2.2 + # via pytest +iniconfig==2.0.0 + # via pytest +mypy==1.14.1 +mypy-extensions==1.0.0 + # via mypy +packaging==24.2 + # via pytest +pluggy==1.5.0 + # via pytest +pycparser==2.22 + # via cffi +pycryptodome==3.21.0 +pytest==8.3.4 + # via pytest-cov +pytest-cov==5.0.0 +ruff==0.9.2 +tomli==2.2.1 + # via coverage + # via mypy + # via pytest +typing-extensions==4.12.2 + # via mypy diff --git a/requirements/docs.txt b/requirements-docs.txt similarity index 100% rename from requirements/docs.txt rename to requirements-docs.txt diff --git a/requirements.lock b/requirements.lock new file mode 100644 index 0000000..0b70866 --- /dev/null +++ b/requirements.lock @@ -0,0 +1,18 @@ +# generated by rye +# use `rye lock` or `rye sync` to update this lockfile +# +# last locked with the following flags: +# pre: false +# features: [] +# all-features: false +# with-sources: false +# generate-hashes: false +# universal: false + +-e file:. +cffi==1.17.1 + # via cryptography +cryptography==44.0.0 + # via joserfc +pycparser==2.22 + # via cffi diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index d5de7ce..0000000 --- a/requirements.txt +++ /dev/null @@ -1,5 +0,0 @@ --r requirements/base.txt --r requirements/lint.txt --r requirements/tests.txt --r requirements/docs.txt -sphinx-intl diff --git a/requirements/base.txt b/requirements/base.txt deleted file mode 100644 index ed0e86d..0000000 --- a/requirements/base.txt +++ /dev/null @@ -1,2 +0,0 @@ -cryptography -pycryptodome diff --git a/requirements/lint.txt b/requirements/lint.txt deleted file mode 100644 index 8881953..0000000 --- a/requirements/lint.txt +++ /dev/null @@ -1,2 +0,0 @@ -mypy -ruff diff --git a/requirements/tests.txt b/requirements/tests.txt deleted file mode 100644 index 0c69b77..0000000 --- a/requirements/tests.txt +++ /dev/null @@ -1,3 +0,0 @@ -pytest -coverage -pytest-cov