Switch to stringdtype name; use ruff instead of flake8

Author: peytondmurray

.gitignore

@@ -130,3 +130,5 @@ dmypy.json
 
 .mesonpy-native-file.ini
 compile_commands.json
+
+.ruff-cache/

.pre-commit-config.yaml

@@ -33,13 +33,13 @@ repos:
         entry: |
           bash -c 'cd unytdtype && mkdir -p build && pip install build meson-python patchelf wheel && python -m build --wheel --no-isolation -Cbuilddir=build';
         fail_fast: false
-      - id: generate-compilation-database-strptrdtype
-        name: Generate compilation database [strptrdtype]
-        files: strptrdtype/(meson\.build$|.*\.(c|h)$)
+      - id: generate-compilation-database-stringdtype
+        name: Generate compilation database [stringdtype]
+        files: stringdtype/(meson\.build$|.*\.(c|h)$)
         language: system
         require_serial: true
         entry: |
-          bash -c 'cd strptrdtype && mkdir -p build && pip install build meson-python patchelf wheel && python -m build --wheel --no-isolation -Cbuilddir=build';
+          bash -c 'cd stringdtype && mkdir -p build && pip install build meson-python patchelf wheel && python -m build --wheel --no-isolation -Cbuilddir=build';
         fail_fast: false
   - repo: https://github.com/pocc/pre-commit-hooks
     rev: v1.3.5
@@ -56,33 +56,30 @@ repos:
         name: clang-tidy [unytdtype]
         args: [-p=unytdtype/build]
         files: unytdtype/(.*\.(c|h)$)
+      - id: clang-tidy
+        name: clang-tidy [stringdtype]
+        args: [-p=stringdtype/build]
+        files: stringdtype/(.*\.(c|h)$)
       - id: clang-format
         args: ['--no-diff', -i]
       # - id: oclint
       # - id: cppcheck
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v4.4.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
       - id: check-yaml
       - id: check-added-large-files
       - id: check-ast
-  - repo: https://github.com/pycqa/flake8
-    rev: 3.9.2
+  - repo: https://github.com/charliermarsh/ruff-pre-commit
+    rev: v0.0.217
     hooks:
-      - id: flake8
-        additional_dependencies:
-          [
-            flake8-mutable,
-            flake8-debugger,
-            flake8-pytest-style,
-            flake8-simplify,
-            pep8-naming,
-            darglint,
-          ]
+    - id: ruff
+      # Respect `exclude` and `extend-exclude` settings.
+      args: ["--force-exclude"]
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.0.0-alpha.0
+    rev: v3.0.0-alpha.4
     hooks:
       - id: prettier
         types:
@@ -91,7 +88,7 @@ repos:
             yaml,
           ]
   - repo: https://github.com/pycqa/isort
-    rev: 5.10.1
+    rev: 5.11.4
     hooks:
       - id: isort
         name: isort (python)

strptrdtype/.clang-format renamed to stringdtype/.clang-format

@@ -1,5 +1,5 @@
 project(
-  'strptrdtype',
+  'stringdtype',
   'c',
 )
 
@@ -17,32 +17,32 @@ incdir_numpy = run_command(py,
 includes = include_directories(
   [
     incdir_numpy,
-    'strptrdtype/src'
+    'stringdtype/src'
   ]
 )
 
 srcs = [
-  'strptrdtype/src/casts.c',
-  'strptrdtype/src/casts.h',
-  'strptrdtype/src/dtype.c',
-  'strptrdtype/src/main.c',
-  # 'strptrdtype/src/umath.c',
-  # 'strptrdtype/src/umath.h',
+  'stringdtype/src/casts.c',
+  'stringdtype/src/casts.h',
+  'stringdtype/src/dtype.c',
+  'stringdtype/src/main.c',
+  # 'stringdtype/src/umath.c',
+  # 'stringdtype/src/umath.h',
 ]
 
 py.install_sources(
   [
-    'strptrdtype/__init__.py',
-    'strptrdtype/scalar.py'
+    'stringdtype/__init__.py',
+    'stringdtype/scalar.py'
   ],
-  subdir: 'strptrdtype'
+  subdir: 'stringdtype'
 )
 
 py.extension_module(
   '_main',
   srcs,
   c_args: ['-g', '-O0', '-pg'],
   install: true,
-  subdir: 'strptrdtype',
+  subdir: 'stringdtype',
   include_directories: includes
 )

strptrdtype/.gitignore renamed to stringdtype/.gitignore

@@ -12,12 +12,19 @@ build-backend = "mesonpy"
 line-length = 79
 
 [project]
-name = "strptrdtype"
-description = "A dtype for storing string pointers data"
+name = "stringdtype"
+description = "A dtype for storing UTF-8 strings"
 version = "0.0.1"
 readme = 'README.md'
-author = "Peyton Murray"
+authors = [
+    { name = "Nathan Goldbaum" },
+    { name = "Peyton Murray" }
+]
 requires-python = ">=3.9.0"
 dependencies = [
     "numpy",
 ]
+
+[tool.ruff]
+line-length = 79
+per-file-ignores = {"__init__.py" = ["F401"]}

strptrdtype/README.md renamed to stringdtype/README.md

@@ -4,7 +4,7 @@
 in Numpy and is not intended for any real purpose.
 """
 
-from .scalar import StrPtrScalar  # isort: skip
-from ._main import StrPtrDType
+from .scalar import StringScalar  # isort: skip
+from ._main import StringDType
 
-__all__ = ["StrPtrDType", "StrScalar"]
+__all__ = ["StringDType", "StringScalar"]

strptrdtype/meson.build renamed to stringdtype/meson.build

@@ -1,7 +1,7 @@
 """A scalar type needed by the dtype machinery."""
 
 
-class StrPtrScalar:
+class StringScalar:
     def __init__(self, value):
         self.value = value
 

strptrdtype/pyproject.toml renamed to stringdtype/pyproject.toml

@@ -11,7 +11,7 @@
 // From https://numpy.org/neps/nep-0043-extensible-ufuncs.html#arraymethod:
 // resolve_descriptors returns the safety of the operation (casting safety)
 static NPY_CASTING
-strptr_to_strptr_resolve_descriptors(PyObject *NPY_UNUSED(self),
+string_to_string_resolve_descriptors(PyObject *NPY_UNUSED(self),
                                      PyArray_DTypeMeta *NPY_UNUSED(dtypes[2]),
                                      PyArray_Descr *given_descrs[2],
                                      PyArray_Descr *loop_descrs[2],
@@ -33,7 +33,7 @@ strptr_to_strptr_resolve_descriptors(PyObject *NPY_UNUSED(self),
 }
 
 static int
-strptr_to_strptr(PyArrayMethod_Context *NPY_UNUSED(context),
+string_to_string(PyArrayMethod_Context *NPY_UNUSED(context),
                  char **const data[], npy_intp const dimensions[],
                  npy_intp const strides[], NpyAuxData *NPY_UNUSED(auxdata))
 {
@@ -55,13 +55,13 @@ strptr_to_strptr(PyArrayMethod_Context *NPY_UNUSED(context),
 static PyArray_DTypeMeta *a2a_dtypes[2] = {NULL, NULL};
 
 static PyType_Slot a2a_slots[] = {
-        {NPY_METH_resolve_descriptors, &strptr_to_strptr_resolve_descriptors},
-        {NPY_METH_strided_loop, &strptr_to_strptr},
-        {NPY_METH_unaligned_strided_loop, &strptr_to_strptr},
+        {NPY_METH_resolve_descriptors, &string_to_string_resolve_descriptors},
+        {NPY_METH_strided_loop, &string_to_string},
+        {NPY_METH_unaligned_strided_loop, &string_to_string},
         {0, NULL}};
 
-PyArrayMethod_Spec StrPtrToStrPtrCastSpec = {
-        .name = "cast_StrPtrDType_to_StrPtrDType",
+PyArrayMethod_Spec StringToStringCastSpec = {
+        .name = "cast_StringDType_to_StringDType",
         .nin = 1,
         .nout = 1,
         .casting = NPY_UNSAFE_CASTING,
@@ -74,7 +74,7 @@ PyArrayMethod_Spec **
 get_casts(void)
 {
     PyArrayMethod_Spec **casts = malloc(2 * sizeof(PyArrayMethod_Spec *));
-    casts[0] = &StrPtrToStrPtrCastSpec;
+    casts[0] = &StringToStringCastSpec;
     casts[1] = NULL;
 
     return casts;