Merge pull request ua-parser#27 from mattrobenolt/install

elsigh · elsigh · commit 8bff839cf808 · 2015-10-15T09:27:54.000-07:00
Fix install from sdist and bdist_wheel
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,8 @@
+*.pyc
+*.egg-info/
+.eggs/
+build/
+dist/
+tmp/
+regexes.yaml
+regexes.json
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,4 @@
+sudo: false
 language: python
 python:
   - "2.6"
@@ -9,7 +10,8 @@ before_install:
   - cp uap-core/regexes.yaml ua_parser/regexes.yaml
 
 install:
-  - pip install .
+  - pip install pyyaml
+  - pip install -e .
 
 script:
   - python ua_parser/user_agent_parser_test.py
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,2 +1,2 @@
-include ua_parser/regexes.yaml
-include ua_parser/regexes.json
+include README.md
+include ua_parser/regexes.json
diff --git a/Makefile b/Makefile
@@ -15,10 +15,12 @@ test:
 	@#python ua_parser/user_agent_parser_test.py ParseTest.testStringsDeviceBrandModel
 
 clean:
-	@rm ua_parser/user_agent_parser.pyc\
+	@rm -f ua_parser/user_agent_parser.pyc\
 	   ua_parser/regexes.yaml\
 	   ua_parser/regexes.json
 	@rm -rf tmp\
-	   ua_parser.egg-info
+	   ua_parser.egg-info\
+	   dist\
+	   build
 
 .PHONY: all clean
diff --git a/setup.cfg b/setup.cfg
@@ -0,0 +1,2 @@
+[bdist_wheel]
+universal = 1
diff --git a/setup.py b/setup.py
@@ -2,26 +2,23 @@
 from setuptools import setup
 from setuptools.command.develop import develop as _develop
 from setuptools.command.sdist import sdist as _sdist
-from setuptools.command.install import install as _install
 
 
 def install_regexes():
     print('Copying regexes.yaml to package directory...')
     import os
-    import shutil
     cwd = os.path.abspath(os.path.dirname(__file__))
     yaml_src = os.path.join(cwd, 'uap-core', 'regexes.yaml')
     if not os.path.exists(yaml_src):
         raise RuntimeError(
                   'Unable to find regexes.yaml, should be at %r' % yaml_src)
-    yaml_dest = os.path.join(cwd, 'ua_parser', 'regexes.yaml')
-    shutil.copy2(yaml_src, yaml_dest)
 
     print('Converting regexes.yaml to regexes.json...')
     import json
     import yaml
-    json_dest = yaml_dest.replace('.yaml', '.json')
-    regexes = yaml.safe_load(open(yaml_dest))
+    json_dest = os.path.join(cwd, 'ua_parser', 'regexes.json')
+    with open(yaml_src, 'rb') as fp:
+        regexes = yaml.safe_load(fp)
     with open(json_dest, "w") as f:
         json.dump(regexes, f)
 
@@ -38,11 +35,6 @@ def run(self):
         _sdist.run(self)
 
 
-class install(_install):
-    def run(self):
-        install_regexes()
-        _install.run(self)
-
 setup(
     name='ua-parser',
     version='0.5.0',
@@ -55,13 +47,12 @@ def run(self):
     zip_safe=False,
     url='https://github.com/ua-parser/uap-python',
     include_package_data=True,
-    package_data={'ua_parser': ['regexes.yaml', 'regexes.json']},
+    package_data={'ua_parser': ['regexes.json']},
     setup_requires=['pyyaml'],
-    install_requires=['pyyaml'],
+    install_requires=[],
     cmdclass={
         'develop': develop,
         'sdist': sdist,
-        'install': install,
     },
     classifiers=[
         'Development Status :: 4 - Beta',
diff --git a/ua_parser/user_agent_parser.py b/ua_parser/user_agent_parser.py
@@ -434,31 +434,24 @@ def GetFilters(user_agent_string, js_user_agent_string=None,
 if not UA_PARSER_YAML:
     try:
         from pkg_resources import resource_filename
-        yamlPath = resource_filename(__name__, 'regexes.yaml')
         json_path = resource_filename(__name__, 'regexes.json')
     except ImportError:
-        yamlPath = os.path.join(ROOT_DIR, 'regexes.yaml')
         json_path = os.path.join(ROOT_DIR, 'regexes.json')
 else:
+    # This will raise an ImportError if missing, obviously since it's no
+    # longer a requirement
     import yaml
 
     with open(UA_PARSER_YAML) as yamlFile:
         regexes = yaml.safe_load(yamlFile)
 
 
-# If UA_PARSER_YAML is not specified, load regexes from regexes.json before
-# falling back to yaml format
+# If UA_PARSER_YAML is not specified, load regexes from regexes.json
 if regexes is None:
-    try:
-        import json
-
-        with open(json_path) as fp:
-            regexes = json.load(fp)
-    except IOError:
-        import yaml
+    import json
 
-        with open(yamlPath) as fp:
-            regexes = yaml.safe_load(fp)
+    with open(json_path) as fp:
+        regexes = json.load(fp)
 
 
 USER_AGENT_PARSERS = []
