From 4efbe8bdd7afe50143b2637e0a4e36418e4af8e4 Mon Sep 17 00:00:00 2001 From: Martin Wendt Date: Sat, 21 Sep 2024 22:23:14 +0200 Subject: [PATCH] drop recommonmark --- Pipfile | 9 +++---- Pipfile.lock | 69 ++++++++++++++++++++------------------------------ pyproject.toml | 29 --------------------- tox.ini | 5 ---- 4 files changed, 30 insertions(+), 82 deletions(-) diff --git a/Pipfile b/Pipfile index ba76b6e..4f0f741 100644 --- a/Pipfile +++ b/Pipfile @@ -4,14 +4,14 @@ verify_ssl = true name = "pypi" [dev-packages] -# black = { version = "~=24.3", extras = ["jupyter"] } fabulist="*" -# isort = "*" +ipykernel = "*" +notebook = "*" +pre-commit = "*" pytest = "*" pytest-cov = "*" PyYAML = "*" rdflib = "*" -recommonmark = "*" ruff = "*" setuptools = ">=42.0" Sphinx = "*" @@ -20,9 +20,6 @@ tox = "*" twine = "*" wheel = "*" yabs = "*" -ipykernel = "*" -notebook = "*" -pre-commit = "*" nutree = {path = ".",editable = true} [packages] diff --git a/Pipfile.lock b/Pipfile.lock index e5d9ccb..ea07fbc 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "b80413f1f1a31c2658c3f60d583dd5e3a27c070c7fce1553b785dc3a4a41adcb" + "sha256": "968b6549b88720b6ca9b10fe2f734971cacb88257eba39f596a0d50863bd8611" }, "pipfile-spec": 6, "requires": { @@ -27,11 +27,11 @@ }, "anyio": { "hashes": [ - "sha256:c5a275fe5ca0afd788001f58fca1e69e29ce706d746e317d660e21f70c530ef9", - "sha256:fdeb095b7cc5a5563175eedd926ec4ae55413bb4be5770c424af0ba46ccb4a78" + "sha256:137b4559cbb034c477165047febb6ff83f390fc3b20bf181c1fc0a728cb8beeb", + "sha256:c7d2e9d63e31599eeb636c8c5c03a7e108d73b345f064f1c19fdc87b79036a9a" ], - "markers": "python_version >= '3.8'", - "version": "==4.5.0" + "markers": "python_version >= '3.9'", + "version": "==4.6.0" }, "appnope": { "hashes": [ @@ -356,13 +356,6 @@ "markers": "python_version >= '3.8'", "version": "==0.2.2" }, - "commonmark": { - "hashes": [ - "sha256:452f9dc859be7f06631ddcb328b6919c67984aca654e5fefb3914d54691aed60", - "sha256:da2f38c92590f83de410ba1a3cbceafbc74fee9def35f9251ba9a971d6d66fd9" - ], - "version": "==0.9.1" - }, "coverage": { "extras": [ "toml" @@ -553,11 +546,11 @@ }, "fabulist": { "hashes": [ - "sha256:6306d25164faafd2663a3c2cea4b95e73d8c51bba568fa340ce21fceb2862806", - "sha256:638f1456aa5ec97753db23abf9408fb56c6c78dbe4625a1e487013fceed1bf51" + "sha256:3a4f003a367303ff4ac3d5fefd1428c93c8bf5257a2c2281a4814f33bf6e928a", + "sha256:7a93b2ff3e18e08f31dd314e8faff7c0216d0f9601c2096e73df5f4201256017" ], "index": "pypi", - "version": "==1.2.0" + "version": "==2.0.0" }, "fastjsonschema": { "hashes": [ @@ -1453,14 +1446,6 @@ "markers": "python_version >= '3.8'", "version": "==43.0" }, - "recommonmark": { - "hashes": [ - "sha256:1b1db69af0231efce3fa21b94ff627ea33dee7079a01dd0a7f8482c3da148b3f", - "sha256:bdb4db649f2222dcd8d2d844f0006b958d627f732415d399791ee436a3686d67" - ], - "index": "pypi", - "version": "==0.7.1" - }, "referencing": { "hashes": [ "sha256:25b42124a6c8b632a425174f24087783efb348a6f1e0008e63cd4466fedf703c", @@ -1628,28 +1613,28 @@ }, "ruff": { "hashes": [ - "sha256:0adb801771bc1f1b8cf4e0a6fdc30776e7c1894810ff3b344e50da82ef50eeb1", - "sha256:0fc030b6fd14814d69ac0196396f6761921bd20831725c7361e1b8100b818034", - "sha256:2653fc3b2a9315bd809725c88dd2446550099728d077a04191febb5ea79a4f79", - "sha256:488f8e15c01ea9afb8c0ba35d55bd951f484d0c1b7c5fd746ce3c47ccdedce68", - "sha256:4b4d32c137bc781c298964dd4e52f07d6f7d57c03eae97a72d97856844aa510a", - "sha256:515a698254c9c47bb84335281a170213b3ee5eb47feebe903e1be10087a167ce", - "sha256:59627e97364329e4eae7d86fa7980c10e2b129e2293d25c478ebcb861b3e3fd6", - "sha256:69c546f412dfae8bb9cc4f27f0e45cdd554e42fecbb34f03312b93368e1cd0a6", - "sha256:6bb1b4995775f1837ab70f26698dd73852bbb82e8f70b175d2713c0354fe9182", - "sha256:704da526c1e137f38c8a067a4a975fe6834b9f8ba7dbc5fd7503d58148851b8f", - "sha256:94c3f78c3d32190aafbb6bc5410c96cfed0a88aadb49c3f852bbc2aa9783a7d8", - "sha256:a4c0698cc780bcb2c61496cbd56b6a3ac0ad858c966652f7dbf4ceb029252fbe", - "sha256:aadf81ddc8ab5b62da7aae78a91ec933cbae9f8f1663ec0325dae2c364e4ad84", - "sha256:aefb0bd15f1cfa4c9c227b6120573bb3d6c4ee3b29fb54a5ad58f03859bc43c6", - "sha256:bb858cd9ce2d062503337c5b9784d7b583bcf9d1a43c4df6ccb5eab774fbafcb", - "sha256:e368aef0cc02ca3593eae2fb8186b81c9c2b3f39acaaa1108eb6b4d04617e61f", - "sha256:efeede5815a24104579a0f6320660536c5ffc1c91ae94f8c65659af915fb9de9", - "sha256:f5bc5398457484fc0374425b43b030e4668ed4d2da8ee7fdda0e926c9f11ccfb" + "sha256:02b083770e4cdb1495ed313f5694c62808e71764ec6ee5db84eedd82fd32d8f5", + "sha256:08277b217534bfdcc2e1377f7f933e1c7957453e8a79764d004e44c40db923f2", + "sha256:0c05fd37013de36dfa883a3854fae57b3113aaa8abf5dea79202675991d48624", + "sha256:17a86aac6f915932d259f7bec79173e356165518859f94649d8c50b81ff087e9", + "sha256:2f0b62056246234d59cbf2ea66e84812dc9ec4540518e37553513392c171cb18", + "sha256:44e52129d82266fa59b587e2cd74def5637b730a69c4542525dfdecfaae38bd5", + "sha256:525201b77f94d2b54868f0cbe5edc018e64c22563da6c5c2e5c107a4e85c1c0d", + "sha256:533d66b7774ef224e7cf91506a7dafcc9e8ec7c059263ec46629e54e7b1f90ab", + "sha256:590445eec5653f36248584579c06252ad2e110a5d1f32db5420de35fb0e1c977", + "sha256:6b1462fa56c832dc0cea5b4041cfc9c97813505d11cce74ebc6d1aae068de36b", + "sha256:8854450839f339e1049fdbe15d875384242b8e85d5c6947bb2faad33c651020b", + "sha256:9ba4efe5c6dbbb58be58dd83feedb83b5e95c00091bf09987b4baf510fee5c99", + "sha256:a0e1655868164e114ba43a908fd2d64a271a23660195017c17691fb6355d59bb", + "sha256:a939ca435b49f6966a7dd64b765c9df16f1faed0ca3b6f16acdf7731969deb35", + "sha256:b28f0d5e2f771c1fe3c7a45d3f53916fc74a480698c4b5731f0bea61e52137c8", + "sha256:b3f8822defd260ae2460ea3832b24d37d203c3577f48b055590a426a722d50ef", + "sha256:c6707a32e03b791f4448dc0dce24b636cbcdee4dd5607adc24e5ee73fd86c00a", + "sha256:f49c9caa28d9bbfac4a637ae10327b3db00f47d038f3fbb2195c4d682e925b14" ], "index": "pypi", "markers": "python_version >= '3.7'", - "version": "==0.6.6" + "version": "==0.6.7" }, "semantic-version": { "hashes": [ diff --git a/pyproject.toml b/pyproject.toml index 92b4cf5..4b73837 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,33 +1,4 @@ -# [tool.black] -# line-length = 88 -# target-version = ['py38', 'py39', 'py310', 'py311'] -# include = '\.pyi?$' -# exclude = ''' -# /( -# \.git -# | \.hg -# | \.tox -# | \.venv -# | \.eggs -# | \.cache -# | build -# | __pycache__ -# | dist -# | \.* - -# )/ -# ''' - - -# [tool.isort] -# # See https://black.readthedocs.io/en/stable/compatible_configs.html -# profile = "black" -# src_paths = ["nutree", "tests"] - [tool.ruff] -# Decrease the maximum line length to 79 characters. -# line-length = 79 -# Support Python 3.10+. target-version = "py38" src = ["nutree", "tests"] diff --git a/tox.ini b/tox.ini index c713a35..581a9be 100644 --- a/tox.ini +++ b/tox.ini @@ -69,18 +69,13 @@ commands = description = Reformat python code using ruff (Black, isort, and pyupgrade) ; # skip_install = true deps = - ; {[testenv:check]deps} - ; pyupgrade ruff allowlist_externals = bash changedir = {toxinidir} commands = - ; bash -ec 'pyupgrade --py38-plus --exit-zero-even-if-changed nutree/*.py tests/*.py setup.py' ruff check --fix nutree tests setup.py ruff format nutree tests setup.py - ; isort --profile black nutree tests setup.py {posargs} - ; black nutree tests setup.py {[testenv:lint]commands}