summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Heimes <christian@python.org>2015-07-08 11:18:17 +0200
committerSimo Sorce <simo@redhat.com>2015-07-08 06:23:13 -0400
commitc4e6d1ffdd348b7a78ea7da6f8af774c4ce0b3c4 (patch)
treefaf696618a8bc677c5005bb7549560be056c51e7
parent77d841778fa5ec2793b3879e475439c2365ec4f6 (diff)
downloadcustodia-c4e6d1ffdd348b7a78ea7da6f8af774c4ce0b3c4.tar.gz
custodia-c4e6d1ffdd348b7a78ea7da6f8af774c4ce0b3c4.tar.xz
custodia-c4e6d1ffdd348b7a78ea7da6f8af774c4ce0b3c4.zip
Fix setup.py and dependencies
setup.py now correctly references LICENSE instead of COPYING. README.md has been renamed to README and a symbolic link README -> README.md has been added. distutils is unable to handle a symbolic link as README. The six package is listed in requirements.txt, too. Reviewed-by: Simo Sorce <simo@redhat.com> Closes: #2
-rw-r--r--.gitignore1
-rw-r--r--README4
l---------[-rw-r--r--]README.md5
-rw-r--r--requirements.txt1
-rwxr-xr-xsetup.py2
5 files changed, 8 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index 7c02a72..d489600 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ dist/
*.pyc
*.pyo
cscope.out
+MANIFEST
diff --git a/README b/README
new file mode 100644
index 0000000..f3f8c29
--- /dev/null
+++ b/README
@@ -0,0 +1,4 @@
+Custodia
+========
+
+A service to manage, retrieve and store secrets for other processes.
diff --git a/README.md b/README.md
index f3f8c29..100b938 100644..120000
--- a/README.md
+++ b/README.md
@@ -1,4 +1 @@
-Custodia
-========
-
-A service to manage, retrieve and store secrets for other processes.
+README \ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index 3e7b26e..3687329 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1,2 @@
jwcrypto
+six
diff --git a/setup.py b/setup.py
index d46b7ff..01c0b5f 100755
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,7 @@ setup(
url='https://github.com/simo5/custodia',
packages = ['custodia', 'custodia.httpd', 'custodia.store'],
data_files = [('share/man/man7', ["man/custodia.7"]),
- ('share/doc/custodia', ['COPYING', 'README']),
+ ('share/doc/custodia', ['LICENSE', 'README']),
('share/doc/custodia/examples', ['custodia.conf']),
],
scripts = ['custodia/custodia']