From 36847210de49bc888d81f57372d58136073cffdc Mon Sep 17 00:00:00 2001 From: Christopher Byrne Date: Sun, 4 Jan 2026 18:13:37 -0600 Subject: [PATCH] Move pkgdir under src subdirectory Otherwise, tests can fail because the name of the subdirectory occuldes with the one in the venv. Signed-off-by: Christopher Byrne --- MANIFEST.in | 4 ++-- pyproject.toml | 5 +---- {pkcs11 => src/pkcs11}/__init__.py | 0 {pkcs11 => src/pkcs11}/_pkcs11.pxd | 2 +- {pkcs11 => src/pkcs11}/_pkcs11.pyi | 0 {pkcs11 => src/pkcs11}/_pkcs11.pyx | 2 +- {pkcs11 => src/pkcs11}/attributes.py | 0 {pkcs11 => src/pkcs11}/constants.py | 0 {pkcs11 => src/pkcs11}/defaults.py | 0 {pkcs11 => src/pkcs11}/exceptions.py | 0 {pkcs11 => src/pkcs11}/mechanisms.py | 0 {pkcs11 => src/pkcs11}/py.typed | 0 {pkcs11 => src/pkcs11}/types.py | 0 {pkcs11 => src/pkcs11}/util/__init__.py | 0 {pkcs11 => src/pkcs11}/util/dh.py | 0 {pkcs11 => src/pkcs11}/util/dsa.py | 0 {pkcs11 => src/pkcs11}/util/ec.py | 0 {pkcs11 => src/pkcs11}/util/rsa.py | 0 {pkcs11 => src/pkcs11}/util/x509.py | 0 19 files changed, 5 insertions(+), 8 deletions(-) rename {pkcs11 => src/pkcs11}/__init__.py (100%) rename {pkcs11 => src/pkcs11}/_pkcs11.pxd (99%) rename {pkcs11 => src/pkcs11}/_pkcs11.pyi (100%) rename {pkcs11 => src/pkcs11}/_pkcs11.pyx (99%) rename {pkcs11 => src/pkcs11}/attributes.py (100%) rename {pkcs11 => src/pkcs11}/constants.py (100%) rename {pkcs11 => src/pkcs11}/defaults.py (100%) rename {pkcs11 => src/pkcs11}/exceptions.py (100%) rename {pkcs11 => src/pkcs11}/mechanisms.py (100%) rename {pkcs11 => src/pkcs11}/py.typed (100%) rename {pkcs11 => src/pkcs11}/types.py (100%) rename {pkcs11 => src/pkcs11}/util/__init__.py (100%) rename {pkcs11 => src/pkcs11}/util/dh.py (100%) rename {pkcs11 => src/pkcs11}/util/dsa.py (100%) rename {pkcs11 => src/pkcs11}/util/ec.py (100%) rename {pkcs11 => src/pkcs11}/util/rsa.py (100%) rename {pkcs11 => src/pkcs11}/util/x509.py (100%) diff --git a/MANIFEST.in b/MANIFEST.in index 8ccfb70..64ebd74 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1,3 @@ graft extern/ -include pkcs11/*.pxd -include pkcs11/py.typed \ No newline at end of file +include src/pkcs11/*.pxd +include src/pkcs11/py.typed diff --git a/pyproject.toml b/pyproject.toml index 49d2472..dd9ed7b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -53,7 +53,7 @@ combine-as-imports = true [tool.setuptools] ext-modules = [ - {name = "pkcs11._pkcs11", sources = ["pkcs11/_pkcs11.pyx"]} + {name = "pkcs11._pkcs11", sources = ["src/pkcs11/_pkcs11.pyx"]} ] [tool.cibuildwheel] @@ -68,9 +68,6 @@ archs = ["AMD64"] [tool.cibuildwheel.macos] archs = ["universal2"] -[tool.setuptools.packages.find] -include = ["pkcs11*"] - [tool.setuptools.package-data] pkcs11 = ["py.typed"] diff --git a/pkcs11/__init__.py b/src/pkcs11/__init__.py similarity index 100% rename from pkcs11/__init__.py rename to src/pkcs11/__init__.py diff --git a/pkcs11/_pkcs11.pxd b/src/pkcs11/_pkcs11.pxd similarity index 99% rename from pkcs11/_pkcs11.pxd rename to src/pkcs11/_pkcs11.pxd index ba1903d..03f094a 100644 --- a/pkcs11/_pkcs11.pxd +++ b/src/pkcs11/_pkcs11.pxd @@ -6,7 +6,7 @@ from cython.view cimport array from pkcs11.exceptions import * -cdef extern from '../extern/cryptoki.h': +cdef extern from '../../extern/cryptoki.h': ctypedef unsigned char CK_BYTE ctypedef CK_BYTE CK_BBOOL diff --git a/pkcs11/_pkcs11.pyi b/src/pkcs11/_pkcs11.pyi similarity index 100% rename from pkcs11/_pkcs11.pyi rename to src/pkcs11/_pkcs11.pyi diff --git a/pkcs11/_pkcs11.pyx b/src/pkcs11/_pkcs11.pyx similarity index 99% rename from pkcs11/_pkcs11.pyx rename to src/pkcs11/_pkcs11.pyx index 27f692e..6a33094 100644 --- a/pkcs11/_pkcs11.pyx +++ b/src/pkcs11/_pkcs11.pyx @@ -1946,7 +1946,7 @@ _CLASS_MAP = { ObjectClass.CERTIFICATE: Certificate, } -cdef extern from "../extern/load_module.c": +cdef extern from "../../extern/load_module.c": ctypedef struct P11_HANDLE: void *get_function_list_ptr diff --git a/pkcs11/attributes.py b/src/pkcs11/attributes.py similarity index 100% rename from pkcs11/attributes.py rename to src/pkcs11/attributes.py diff --git a/pkcs11/constants.py b/src/pkcs11/constants.py similarity index 100% rename from pkcs11/constants.py rename to src/pkcs11/constants.py diff --git a/pkcs11/defaults.py b/src/pkcs11/defaults.py similarity index 100% rename from pkcs11/defaults.py rename to src/pkcs11/defaults.py diff --git a/pkcs11/exceptions.py b/src/pkcs11/exceptions.py similarity index 100% rename from pkcs11/exceptions.py rename to src/pkcs11/exceptions.py diff --git a/pkcs11/mechanisms.py b/src/pkcs11/mechanisms.py similarity index 100% rename from pkcs11/mechanisms.py rename to src/pkcs11/mechanisms.py diff --git a/pkcs11/py.typed b/src/pkcs11/py.typed similarity index 100% rename from pkcs11/py.typed rename to src/pkcs11/py.typed diff --git a/pkcs11/types.py b/src/pkcs11/types.py similarity index 100% rename from pkcs11/types.py rename to src/pkcs11/types.py diff --git a/pkcs11/util/__init__.py b/src/pkcs11/util/__init__.py similarity index 100% rename from pkcs11/util/__init__.py rename to src/pkcs11/util/__init__.py diff --git a/pkcs11/util/dh.py b/src/pkcs11/util/dh.py similarity index 100% rename from pkcs11/util/dh.py rename to src/pkcs11/util/dh.py diff --git a/pkcs11/util/dsa.py b/src/pkcs11/util/dsa.py similarity index 100% rename from pkcs11/util/dsa.py rename to src/pkcs11/util/dsa.py diff --git a/pkcs11/util/ec.py b/src/pkcs11/util/ec.py similarity index 100% rename from pkcs11/util/ec.py rename to src/pkcs11/util/ec.py diff --git a/pkcs11/util/rsa.py b/src/pkcs11/util/rsa.py similarity index 100% rename from pkcs11/util/rsa.py rename to src/pkcs11/util/rsa.py diff --git a/pkcs11/util/x509.py b/src/pkcs11/util/x509.py similarity index 100% rename from pkcs11/util/x509.py rename to src/pkcs11/util/x509.py