From 40e62a7e195886a5b781cab72d7257f9e507557a Mon Sep 17 00:00:00 2001
From: Donald Stufft <donald@stufft.io>
Date: Sat, 5 Oct 2013 19:49:41 -0400
Subject: [PATCH] Move nacl into the src directory
---
setup.py | 15 ++++++++++-----
{nacl => src/nacl}/__init__.py | 0
{nacl => src/nacl}/encoding.py | 0
{nacl => src/nacl}/exceptions.py | 0
{nacl => src/nacl}/hash.py | 0
{nacl => src/nacl}/nacl.py | 0
{nacl => src/nacl}/public.py | 0
{nacl => src/nacl}/secret.py | 0
{nacl => src/nacl}/signing.py | 0
{nacl => src/nacl}/six.py | 0
{nacl => src/nacl}/utils.py | 0
11 files changed, 10 insertions(+), 5 deletions(-)
rename {nacl => src/nacl}/__init__.py (100%)
rename {nacl => src/nacl}/encoding.py (100%)
rename {nacl => src/nacl}/exceptions.py (100%)
rename {nacl => src/nacl}/hash.py (100%)
rename {nacl => src/nacl}/nacl.py (100%)
rename {nacl => src/nacl}/public.py (100%)
rename {nacl => src/nacl}/secret.py (100%)
rename {nacl => src/nacl}/signing.py (100%)
rename {nacl => src/nacl}/six.py (100%)
rename {nacl => src/nacl}/utils.py (100%)
diff --git a/setup.py b/setup.py
index 9787d911..449d4892 100644
--- a/setup.py
+++ b/setup.py
@@ -11,11 +11,6 @@ from distutils.command.build_clib import build_clib as _build_clib
from setuptools import setup
-import nacl
-
-
-SODIUM_VERSION = "0.4.3"
-
def here(*paths):
return os.path.abspath(os.path.join(os.path.dirname(__file__), *paths))
@@ -23,6 +18,15 @@ def here(*paths):
sodium = functools.partial(here, "src/libsodium/src/libsodium")
+sys.path.append(here("src"))
+
+
+import nacl
+
+
+SODIUM_VERSION = "0.4.3"
+
+
def which(name, flags=os.X_OK): # Taken from twisted
result = []
exts = filter(None, os.environ.get('PATHEXT', '').split(os.pathsep))
@@ -173,6 +177,7 @@ setup(
},
tests_require=["pytest"],
+ package_dir={"": "src"},
packages=[
"nacl",
],
diff --git a/nacl/__init__.py b/src/nacl/__init__.py
similarity index 100%
rename from nacl/__init__.py
rename to src/nacl/__init__.py
diff --git a/nacl/encoding.py b/src/nacl/encoding.py
similarity index 100%
rename from nacl/encoding.py
rename to src/nacl/encoding.py
diff --git a/nacl/exceptions.py b/src/nacl/exceptions.py
similarity index 100%
rename from nacl/exceptions.py
rename to src/nacl/exceptions.py
diff --git a/nacl/hash.py b/src/nacl/hash.py
similarity index 100%
rename from nacl/hash.py
rename to src/nacl/hash.py
diff --git a/nacl/nacl.py b/src/nacl/nacl.py
similarity index 100%
rename from nacl/nacl.py
rename to src/nacl/nacl.py
diff --git a/nacl/public.py b/src/nacl/public.py
similarity index 100%
rename from nacl/public.py
rename to src/nacl/public.py
diff --git a/nacl/secret.py b/src/nacl/secret.py
similarity index 100%
rename from nacl/secret.py
rename to src/nacl/secret.py
diff --git a/nacl/signing.py b/src/nacl/signing.py
similarity index 100%
rename from nacl/signing.py
rename to src/nacl/signing.py
diff --git a/nacl/six.py b/src/nacl/six.py
similarity index 100%
rename from nacl/six.py
rename to src/nacl/six.py
diff --git a/nacl/utils.py b/src/nacl/utils.py
similarity index 100%
rename from nacl/utils.py
rename to src/nacl/utils.py
--
GitLab