Fix setup.py install and recommend this to install manually

mattrobenolt · mattrobenolt · commit 5fc0eb454402 · 2015-12-21T16:53:34.000-08:00
diff --git a/Makefile b/Makefile
@@ -10,9 +10,10 @@ test: clean
 
 clean:
 	@find . -name '*.pyc' -delete
-	@rm -rf tmp\
-	   ua_parser.egg-info\
-	   dist\
-	   build
+	@rm -rf tmp \
+	   ua_parser.egg-info \
+	   dist \
+	   build \
+	   ua_parser/_regexes.py
 
 .PHONY: all test clean
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ $ pip install ua-parser
 ### Manual install
 In the top-level directory run:
 ```
-$ make
+$ python setup.py install
 ```
 
 ##Getting Started
@@ -52,9 +52,9 @@ $ make
 >>> ua_string = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2272.104 Safari/537.36'
 >>> parsed_string = user_agent_parser.ParseUserAgent(ua_string)
 >>> pp.pprint(parsed_string)
- {   'family': 'Chrome', 
-	 'major': '41', 
-	 'minor': '0', 
+ {   'family': 'Chrome',
+	 'major': '41',
+	 'minor': '0',
 	 'patch': '2272'}
 ```
 
@@ -84,13 +84,13 @@ $ make
 >>> ua_string = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2272.104 Safari/537.36'
 >>> parsed_string = user_agent_parser.ParseDevice(ua_string)
 >>> pp.pprint(parsed_string)
-{   'brand': None, 
-	'family': 'Other', 
+{   'brand': None,
+	'family': 'Other',
 	'model': None}
 ```
 
 
 ## Copyright
 
-Copyright 2008 Google Inc. See ua_parser/LICENSE for more information 
+Copyright 2008 Google Inc. See ua_parser/LICENSE for more information
 
diff --git a/setup.py b/setup.py
@@ -2,9 +2,11 @@
 import os
 from distutils import log
 from distutils.core import Command
+from distutils.command.build import build as _build
 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 check_output(*args, **kwargs):
@@ -49,7 +51,7 @@ def force_bytes(text):
         import yaml
         py_dest = os.path.join(work_path, 'ua_parser', '_regexes.py')
 
-        log.info('Compiling regexes.yaml -> _regexes.py')
+        log.info('compiling regexes.yaml -> _regexes.py')
         with open(yaml_src, 'rb') as fp:
             regexes = yaml.safe_load(fp)
         with open(py_dest, 'wb') as fp:
@@ -109,13 +111,27 @@ def run(self):
         _develop.run(self)
 
 
+class build(_build):
+    def run(self):
+        self.run_command('build_regexes')
+        _build.run(self)
+
+
+class install(_install):
+    def run(self):
+        self.run_command('build_regexes')
+        _install.run(self)
+
+
 class sdist(_sdist):
     sub_commands = _sdist.sub_commands + [('build_regexes', None)]
 
 
 cmdclass = {
     'develop': develop,
+    'build': build,
     'sdist': sdist,
+    'install': install,
     'build_regexes': build_regexes,
 }
 
