add pyproject,ruff and rm old setup.py

Author: arcinston

.bumpversion.cfg

@@ -0,0 +1,12 @@
+[bumpversion]
+current_version = 0.0.9
+commit = True
+tag = True
+
+[bumpversion:file:pyproject.toml]
+search = version = "{current_version}"
+replace = version = "{new_version}"
+
+[bumpversion:file:multiaddr/__init__.py]
+search = __version__ = '{current_version}'
+replace = __version__ = '{new_version}'

.editorconfig

@@ -23,6 +23,8 @@ var/
 *.egg-info/
 .installed.cfg
 *.egg
+poetry.lock
+uv.lock
 
 # PyInstaller
 #  Usually these files are written by a python script from a template

.flake8

@@ -0,0 +1,33 @@
+exclude: '.project-template|docs/conf.py|.*pb2\..*'
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v5.0.0
+    hooks:
+      - id: check-yaml
+      - id: check-toml
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v3.15.0
+    hooks:
+      - id: pyupgrade
+        args: [--py39-plus]
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.11.10
+    hooks:
+      - id: ruff
+        args: [--fix, --exit-non-zero-on-fix]
+      - id: ruff-format
+  - repo: https://github.com/northisup/pyright-pretty
+    rev: v0.1.0
+    hooks:
+      - id: pyright-pretty
+        args: [--show-summary]
+  - repo: local
+    hooks:
+      - id: check-rst-files
+        name: Check for .rst files in the top-level directory
+        entry: python -c "import glob, sys; rst_files = glob.glob('*.rst'); sys.exit(1) if rst_files else sys.exit(0)"
+        language: system
+        always_run: true
+        pass_filenames: false

.gitignore

@@ -16,7 +16,7 @@ help:
 	@echo "clean-build - remove build artifacts"
 	@echo "clean-pyc - remove Python file artifacts"
 	@echo "clean-test - remove test and coverage artifacts"
-	@echo "lint - check style with flake8"
+	@echo "lint - check style with ruff"
 	@echo "test - run tests quickly with the default Python"
 	@echo "test-all - run tests on every Python version with tox"
 	@echo "coverage - check code coverage quickly with the default Python"
@@ -49,13 +49,13 @@ setup:
 	pip install -r requirements_dev.txt
 
 lint:
-	flake8 multiaddr/* tests/*
+	python -m ruff check --fix
 
 fix:
-	python -m ruff check --fix .
+	python -m ruff check --fix
 
 typecheck:
-	pre-commit run mypy-local --all-files && pre-commit run pyright-pretty --all-files
+	pre-commit run pyright-pretty --all-files
 
 test:
 	python -m pytest tests

.pre-commit-config.yaml

@@ -1,6 +1,5 @@
 import importlib
-from typing import Dict, Union, Any
-
+from typing import Any, Dict, Union
 
 # These are special sizes
 LENGTH_PREFIXED_VAR_SIZE = -1
@@ -32,7 +31,7 @@ def to_bytes(self, proto: Any, string: str) -> bytes:
 
 
 def codec_by_name(name: Union[str, None]) -> CodecBase:
-    if name is None:  # Special "do nothing – expect nothing" pseudo-codec
+    if name is None:  # Special "do nothing - expect nothing" pseudo-codec
         return NoneCodec()
     codec = CODEC_CACHE.get(name)
     if codec is None:

Makefile

@@ -1,8 +1,9 @@
+from typing import Dict, List
+
 import base58
 import cid
-from typing import Dict, List
-from ..codecs import CodecBase
 
+from ..codecs import CodecBase
 from . import LENGTH_PREFIXED_VAR_SIZE
 
 SIZE = LENGTH_PREFIXED_VAR_SIZE
@@ -11,56 +12,55 @@
 
 # Spec: https://github.com/libp2p/specs/blob/master/peer-ids/peer-ids.md#string-representation
 CIDv0_PREFIX_TO_LENGTH: Dict[str, List[int]] = {
-    # base58btc prefixes for valid lengths 1 – 42 with the identity "hash" function
-    '12': [5, 12, 19, 23, 30, 41, 52, 56],
-    '13': [9, 16, 34, 45],
-    '14': [27, 38, 49, 60],
-    '15': [3, 6, 20],
-    '16': [3, 6, 13, 20, 31, 42, 53],
-    '17': [3, 13, 42],
-    '18': [3],
-    '19': [3, 24, 57],
-    '1A': [24, 35, 46],
-    '1B': [35],
-    '1D': [17],
-    '1E': [10, 17],
-    '1F': [10],
-    '1G': [10, 28, 50],
-    '1H': [28, 39],
-    '1P': [21],
-    '1Q': [21],
-    '1R': [21, 54],
-    '1S': [54],
-    '1T': [7, 32, 43],
-    '1U': [7, 32, 43],
-    '1V': [7],
-    '1W': [7, 14],
-    '1X': [7, 14],
-    '1Y': [7, 14],
-    '1Z': [7, 14],
-    '1f': [4],
-    '1g': [4, 58],
-    '1h': [4, 25, 58],
-    '1i': [4, 25],
-    '1j': [4, 25],
-    '1k': [4, 25, 47],
-    '1m': [4, 36, 47],
-    '1n': [4, 36],
-    '1o': [4, 36],
-    '1p': [4],
-    '1q': [4],
-    '1r': [4],
-    '1s': [4],
-    '1t': [4],
-    '1u': [4],
-    '1v': [4],
-    '1w': [4],
-    '1x': [4],
-    '1y': [4],
-    '1z': [4, 18],
-
+    # base58btc prefixes for valid lengths 1 - 42 with the identity "hash" function
+    "12": [5, 12, 19, 23, 30, 41, 52, 56],
+    "13": [9, 16, 34, 45],
+    "14": [27, 38, 49, 60],
+    "15": [3, 6, 20],
+    "16": [3, 6, 13, 20, 31, 42, 53],
+    "17": [3, 13, 42],
+    "18": [3],
+    "19": [3, 24, 57],
+    "1A": [24, 35, 46],
+    "1B": [35],
+    "1D": [17],
+    "1E": [10, 17],
+    "1F": [10],
+    "1G": [10, 28, 50],
+    "1H": [28, 39],
+    "1P": [21],
+    "1Q": [21],
+    "1R": [21, 54],
+    "1S": [54],
+    "1T": [7, 32, 43],
+    "1U": [7, 32, 43],
+    "1V": [7],
+    "1W": [7, 14],
+    "1X": [7, 14],
+    "1Y": [7, 14],
+    "1Z": [7, 14],
+    "1f": [4],
+    "1g": [4, 58],
+    "1h": [4, 25, 58],
+    "1i": [4, 25],
+    "1j": [4, 25],
+    "1k": [4, 25, 47],
+    "1m": [4, 36, 47],
+    "1n": [4, 36],
+    "1o": [4, 36],
+    "1p": [4],
+    "1q": [4],
+    "1r": [4],
+    "1s": [4],
+    "1t": [4],
+    "1u": [4],
+    "1v": [4],
+    "1w": [4],
+    "1x": [4],
+    "1y": [4],
+    "1z": [4, 18],
     # base58btc prefix for length 42 with the sha256 hash function
-    'Qm': [46],
+    "Qm": [46],
 }
 
 PROTO_NAME_TO_CIDv1_CODEC: Dict[str, str] = {
@@ -104,7 +104,7 @@ def to_string(self, proto, buf):
         if _is_binary_cidv0_multihash(buf):  # CIDv0
             if not expected_codec:
                 # Simply encode as base58btc as there is nothing better to do
-                return base58.b58encode(buf).decode('ascii')
+                return base58.b58encode(buf).decode("ascii")
 
             # "Implementations SHOULD display peer IDs using the first (raw
             #  base58btc encoded multihash) format until the second format is

multiaddr/codecs/__init__.py

@@ -3,7 +3,6 @@
 from ..codecs import CodecBase
 from ..exceptions import BinaryParseError
 
-
 SIZE = -1
 IS_PATH = False
 

multiaddr/codecs/cid.py

@@ -1,6 +1,5 @@
 from ..codecs import CodecBase
 
-
 SIZE = -1
 IS_PATH = True