Skip to content

Commit

Permalink
Rye (#182)
Browse files Browse the repository at this point in the history
- Transition to [Rye](https://rye.astral.sh)
- Update dependencies and pre-commit
  • Loading branch information
Buried-In-Code authored Jul 2, 2024
1 parent 7398bc0 commit 7b4c2dd
Show file tree
Hide file tree
Showing 22 changed files with 272 additions and 39 deletions.
13 changes: 11 additions & 2 deletions .github/dependabot.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
version: 2
updates:
- package-ecosystem: pip
- package-ecosystem: github-actions
directory: /
schedule:
interval: daily
- package-ecosystem: github-actions
groups:
github_actions:
patterns:
- "*"

- package-ecosystem: pip
directory: /
schedule:
interval: daily
groups:
python:
patterns:
- "*"
4 changes: 2 additions & 2 deletions .github/workflows/testing.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ jobs:
fail-fast: false
matrix:
python-version:
- 3.8
- 3.9
- '3.8'
- '3.9'
- '3.10'
- '3.11'
- '3.12'
Expand Down
12 changes: 7 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.3.2
rev: v0.5.0
hooks:
- id: ruff-format
- id: ruff
Expand All @@ -15,13 +15,15 @@ repos:
- --number
- --wrap=keep
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.5.0
rev: v4.6.0
hooks:
- id: check-ast
- id: check-builtin-literals
- id: check-case-conflict
- id: check-docstring-first
- id: check-merge-conflict
args:
- --assume-in-merge
- id: check-toml
- id: check-yaml
args:
Expand All @@ -30,12 +32,12 @@ repos:
exclude_types:
- json
- xml
- id: fix-encoding-pragma
args:
- --remove
- id: fix-byte-order-marker
- id: forbid-submodules
- id: mixed-line-ending
args:
- --fix=auto
- id: name-tests-test
- id: trailing-whitespace
args:
- --markdown-linebreak-ext=md
Expand Down
13 changes: 3 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@
[![PyPI - Version](https://img.shields.io/pypi/v/Simyan.svg?logo=Python&label=Version&style=flat-square)](https://pypi.python.org/pypi/Simyan/)
[![PyPI - License](https://img.shields.io/pypi/l/Simyan.svg?logo=Python&label=License&style=flat-square)](https://opensource.org/licenses/GPL-3.0)

[![Hatch](https://img.shields.io/badge/Packaging-Hatch-4051b5?style=flat-square)](https://github.com/pypa/hatch)
[![Pre-Commit](https://img.shields.io/badge/Pre--Commit-Enabled-informational?style=flat-square&logo=pre-commit)](https://github.com/pre-commit/pre-commit)
[![Black](https://img.shields.io/badge/Code--Style-Black-000000?style=flat-square)](https://github.com/psf/black)
[![Ruff](https://img.shields.io/badge/Linter-Ruff-informational?style=flat-square)](https://github.com/charliermarsh/ruff)
[![Rye](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/rye/main/artwork/badge.json?style=flat-square)](https://rye.astral.sh)
[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&style=flat-square)](https://github.com/pre-commit/pre-commit)
[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json?style=flat-square)](https://github.com/astral-sh/ruff)

[![Github - Contributors](https://img.shields.io/github/contributors/Metron-Project/Simyan.svg?logo=Github&label=Contributors&style=flat-square)](https://github.com/Metron-Project/Simyan/graphs/contributors)
[![Github Action - Testing](https://img.shields.io/github/actions/workflow/status/Metron-Project/Simyan/testing.yaml?branch=main&logo=Github&label=Testing&style=flat-square)](https://github.com/Metron-Project/Simyan/actions/workflows/testing.yaml)
Expand Down Expand Up @@ -53,12 +52,6 @@ Please use the [GitHub issue tracker](https://github.com/Metron-Project/Simyan/i

Big thanks to [Mokkari](https://github.com/Metron-Project/mokkari) for the inspiration and template for this project.

Who or what is Simyan?

> Simyan along with his partner Mokkari, are the diminutive proprietors of the Evil Factory, an evil version of Project Cadmus created by Darkseid and his elite.
>
> More details at [Simyan (New Earth)](<https://dc.fandom.com/wiki/Simyan_(New_Earth)>)
## Socials

[![Social - Matrix](https://img.shields.io/matrix/metron-general:matrix.org?label=Metron%20General&logo=matrix&style=for-the-badge)](https://matrix.to/#/#metron-general:matrix.org)
35 changes: 20 additions & 15 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ classifiers = [
"Typing :: Typed"
]
dependencies = [
"eval-type-backport >= 0.1.3; python_version < \"3.10\"",
"pydantic >= 2.6.4",
"eval-type-backport >= 0.2.0; python_version < \"3.10\"",
"pydantic >= 2.8.0",
"ratelimit >= 2.2.1",
"requests >= 2.31.0"
"requests >= 2.32.3"
]
description = "A Python wrapper for the Comicvine API."
dynamic = ["version"]
Expand All @@ -42,19 +42,15 @@ readme = "README.md"
requires-python = ">= 3.8"

[project.optional-dependencies]
dev = [
"pre-commit >= 3.5.0"
]
docs = [
"mkdocs >= 1.5.3",
"mkdocs-include-markdown-plugin >= 6.0.4",
"mkdocs-material >= 9.5.13",
"mkdocstrings[python] >= 0.24.1"
"mkdocs >= 1.6.0",
"mkdocs-include-markdown-plugin >= 6.2.1",
"mkdocs-material >= 9.5.27",
"mkdocstrings[python] >= 0.25.1"
]
test = [
"pytest >= 8.1.1",
"pytest-cov >= 4.1.0",
"tox >= 4.14.1"
"pytest >= 8.2.2",
"pytest-cov >= 5.0.0"
]

[project.urls]
Expand Down Expand Up @@ -96,7 +92,6 @@ ignore = [
"PLR2004",
"TCH"
]
ignore-init-module-imports = true
select = ["ALL"]

[tool.ruff.lint.flake8-annotations]
Expand All @@ -117,7 +112,17 @@ split-on-trailing-comma = false
classmethod-decorators = ["classmethod", "pydantic.field_validator"]

[tool.ruff.lint.per-file-ignores]
"tests/test_*.py" = ["S101"]
"tests/*_test.py" = ["S101"]

[tool.ruff.lint.pydocstyle]
convention = "google"

[tool.ruff.lint.pyupgrade]
keep-runtime-typing = true

[tool.rye]
dev-dependencies = [
"pre-commit >= 3.5.0",
"tox >= 4.15.1",
"tox-rye @ git+https://github.com/bluss/tox-rye"
]
187 changes: 187 additions & 0 deletions requirements-dev.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,187 @@
# generated by rye
# use `rye lock` or `rye sync` to update this lockfile
#
# last locked with the following flags:
# pre: false
# features: []
# all-features: true
# with-sources: false
# generate-hashes: false

-e file:.
annotated-types==0.7.0
# via pydantic
astunparse==1.6.3
# via griffe
babel==2.15.0
# via mkdocs-material
bracex==2.4
# via wcmatch
cachetools==5.3.3
# via tox
certifi==2024.6.2
# via requests
cfgv==3.4.0
# via pre-commit
chardet==5.2.0
# via tox
charset-normalizer==3.3.2
# via requests
click==8.1.7
# via mkdocs
# via mkdocstrings
colorama==0.4.6
# via griffe
# via mkdocs-material
# via tox
coverage==7.5.4
# via pytest-cov
distlib==0.3.8
# via virtualenv
eval-type-backport==0.2.0
# via simyan
exceptiongroup==1.2.1
# via pytest
filelock==3.15.4
# via tox
# via virtualenv
ghp-import==2.1.0
# via mkdocs
griffe==0.47.0
# via mkdocstrings-python
identify==2.5.36
# via pre-commit
idna==3.7
# via requests
importlib-metadata==8.0.0
# via markdown
# via mkdocs
# via mkdocs-get-deps
# via mkdocstrings
iniconfig==2.0.0
# via pytest
jinja2==3.1.4
# via mkdocs
# via mkdocs-material
# via mkdocstrings
markdown==3.6
# via mkdocs
# via mkdocs-autorefs
# via mkdocs-material
# via mkdocstrings
# via pymdown-extensions
markupsafe==2.1.5
# via jinja2
# via mkdocs
# via mkdocs-autorefs
# via mkdocstrings
mergedeep==1.3.4
# via mkdocs
# via mkdocs-get-deps
mkdocs==1.6.0
# via mkdocs-autorefs
# via mkdocs-include-markdown-plugin
# via mkdocs-material
# via mkdocstrings
# via simyan
mkdocs-autorefs==1.0.1
# via mkdocstrings
mkdocs-get-deps==0.2.0
# via mkdocs
mkdocs-include-markdown-plugin==6.2.1
# via simyan
mkdocs-material==9.5.27
# via simyan
mkdocs-material-extensions==1.3.1
# via mkdocs-material
mkdocstrings==0.25.1
# via mkdocstrings-python
# via simyan
mkdocstrings-python==1.10.5
# via mkdocstrings
nodeenv==1.9.1
# via pre-commit
packaging==24.1
# via mkdocs
# via pyproject-api
# via pytest
# via tox
paginate==0.5.6
# via mkdocs-material
pathspec==0.12.1
# via mkdocs
platformdirs==4.2.2
# via mkdocs-get-deps
# via mkdocstrings
# via tox
# via virtualenv
pluggy==1.5.0
# via pytest
# via tox
pre-commit==3.5.0
pydantic==2.8.0
# via simyan
pydantic-core==2.20.0
# via pydantic
pygments==2.18.0
# via mkdocs-material
pymdown-extensions==10.8.1
# via mkdocs-material
# via mkdocstrings
pyproject-api==1.7.1
# via tox
pytest==8.2.2
# via pytest-cov
# via simyan
pytest-cov==5.0.0
# via simyan
python-dateutil==2.9.0.post0
# via ghp-import
pytz==2024.1
# via babel
pyyaml==6.0.1
# via mkdocs
# via mkdocs-get-deps
# via pre-commit
# via pymdown-extensions
# via pyyaml-env-tag
pyyaml-env-tag==0.1
# via mkdocs
ratelimit==2.2.1
# via simyan
regex==2024.5.15
# via mkdocs-material
requests==2.32.3
# via mkdocs-material
# via simyan
six==1.16.0
# via astunparse
# via python-dateutil
tomli==2.0.1
# via coverage
# via pyproject-api
# via pytest
# via tox
tox==4.15.1
tox-rye @ git+https://github.com/bluss/tox-rye@d1348e996d642e947cd0fb158ecdbcfe0f386af3
typing-extensions==4.12.2
# via annotated-types
# via mkdocstrings
# via pydantic
# via pydantic-core
urllib3==2.2.2
# via requests
virtualenv==20.26.3
# via pre-commit
# via tox
# via virtualenv-rye-discovery
virtualenv-rye-discovery @ git+https://github.com/bluss/virtualenv-rye-discovery@4958f87a8fef73a1dddbb02fa3a98c93bab48377
# via tox-rye
watchdog==4.0.1
# via mkdocs
wcmatch==8.5.2
# via mkdocs-include-markdown-plugin
wheel==0.43.0
# via astunparse
zipp==3.19.2
# via importlib-metadata
35 changes: 35 additions & 0 deletions requirements.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# 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

-e file:.
annotated-types==0.7.0
# via pydantic
certifi==2024.6.2
# via requests
charset-normalizer==3.3.2
# via requests
eval-type-backport==0.2.0
# via simyan
idna==3.7
# via requests
pydantic==2.8.0
# via simyan
pydantic-core==2.20.0
# via pydantic
ratelimit==2.2.1
# via simyan
requests==2.32.3
# via simyan
typing-extensions==4.12.2
# via annotated-types
# via pydantic
# via pydantic-core
urllib3==2.2.2
# via requests
Loading

0 comments on commit 7b4c2dd

Please sign in to comment.