summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--setup.py9
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 7f06b7c..5e5b4ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@
creation is now done after reading all the configuration values;
the function also creates the combox directory if it does not
already exist.
+ * setup.py: added function for reading a file; we don't use the
+ read_file function from combox.file module anymore.
2016-01-10 Siddharth Ravikumar <sravik@bgsu.edu>
diff --git a/setup.py b/setup.py
index 5fe4240..b0ca78a 100644
--- a/setup.py
+++ b/setup.py
@@ -20,13 +20,18 @@
from setuptools import setup, find_packages
-from combox.file import read_file
from combox._version import get_version
+
+def readf(filename):
+ with open(filename, 'r') as f:
+ return f.read()
+
+
config = {
'name': 'combox',
'description': 'Encrypts files and scatters them across storage provided by Google Drive and Dropbox.',
- 'long_description': read_file('README.rst'),
+ 'long_description': readf('README.rst'),
'version': get_version(),
'platforms': ['GNU/Linux', 'OS X'],
'license': 'GNU General Public License version 3 or later',