From: Lowe Thiderman <redacted>
Date: Tue, 27 May 2014 22:13:58 +0000 (+0200)
Subject: Move static files into module directory
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=765a01908d40effd7e7e329480f80b6c7c1609ed;p=redacted-XKCD-password-generator.git

Move static files into module directory

To be able to distribute the package, we need to include the static word lists
into the package module.

Also, add MANIFEST.in to tell setup.py that it's able to include the files. The
MANIFEST.in file is generic and any new added files into xkcdpass/static/ will
be added into new versions of the package.
---

diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..89bbc93
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1 @@
+include xkcdpass/static/*
diff --git a/setup.py b/setup.py
index 826afd8..ecf3dbc 100644
--- a/setup.py
+++ b/setup.py
@@ -3,13 +3,12 @@ from setuptools import setup
 
 setup(
     name='xkcdpass',
-    version='1.0',
+    version='1.0.0',
     author='Steven Tobin',
     author_email='steventtobin@gmail.com',
     url='https://github.com/redacted/XKCD-password-generator',
     description='Generate secure multiword passwords/passphrases, inspired by XKCD',
     long_description=open('README.mkd').read(),
-    package_dir={'': 'xkcdpass'},
     packages=['xkcdpass'],
     zip_safe=False,
     license='BSD',
diff --git a/2of12.txt b/xkcdpass/static/2of12.txt
similarity index 100%
rename from 2of12.txt
rename to xkcdpass/static/2of12.txt
diff --git a/3esl.txt b/xkcdpass/static/3esl.txt
similarity index 100%
rename from 3esl.txt
rename to xkcdpass/static/3esl.txt