From 137f3d24670aa1ad5128e6dab3399bebae90b448 Mon Sep 17 00:00:00 2001
From: Chris Ballinger <chrisballinger@gmail.com>
Date: Wed, 23 Oct 2013 16:43:06 -0700
Subject: [PATCH] Fix packaging again

---
 MANIFEST.in      |  2 +-
 requirements.txt |  1 -
 setup.py         | 38 +++++---------------------------------
 3 files changed, 6 insertions(+), 35 deletions(-)
 delete mode 100644 requirements.txt

diff --git a/MANIFEST.in b/MANIFEST.in
index d18a98d..7152b80 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1 +1 @@
-include README.md LICENSE requirements.txt
\ No newline at end of file
+include README.md LICENSE
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index dcee154..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1 +0,0 @@
-chardet==2.1.1
\ No newline at end of file
diff --git a/setup.py b/setup.py
index ac6cfd1..5fe6df8 100644
--- a/setup.py
+++ b/setup.py
@@ -1,38 +1,8 @@
 #!/usr/bin/env python
-import os, re
 from distutils.core import setup
 
-def get_requirements(filename):
-    """
-    Read requirements and dependency links from a file passed by parameter
-    and return them as two lists in a tuple.
-    """
-    def add_dependency_link(line):
-        link = re.sub(r'\s*-[ef]\s+', '', line)
-        filename = os.path.basename(link.split('://')[1])
-        url = link.split(filename)[0]
-        if url not in dependency_links:
-            dependency_links.append(url)
-
-    requirements = []
-    dependency_links = []
-    for line in open(filename, 'r').read().split('\n'):
-        if re.match(r'(\s*#)|(\s*$)', line):
-            continue
-        if re.match(r'\s*-e\s+', line):
-            # TODO support version numbers
-            requirements.append(re.sub(r'\s*-e\s+.*#egg=(.*)$', r'\1', line))
-            add_dependency_link(line)
-        elif re.match(r'\s*-f\s+', line):
-            add_dependency_link(line)
-        else:
-            requirements.append(line)
-    return requirements, dependency_links
-
-requirements, dependency_links = get_requirements('requirements.txt')
-
 setup(name='localizable',
-      version='0.1.1',
+      version='0.1.2',
       description='Localizable.strings parser for Apple-specific localization files',
       author='Chris Ballinger',
       author_email='chris@chatsecure.org',
@@ -40,5 +10,7 @@ def add_dependency_link(line):
       license="GPLv2",
       long_description=open('README.md').read(),
       py_modules=['localizable'],
-      install_requires=requirements,
-     )
\ No newline at end of file
+      install_requires=[
+        'chardet',
+      ],     
+)
\ No newline at end of file