fpm 0.4.2 → 0.4.3

data/CHANGELIST

@@ -1,3 +1,7 @@
+0.4.3 (March 21, 2012)
+  - Fix bug in python packaging when invoked with a relative path to a setup.py
+    (Reported by Thomas Meson, https://github.com/jordansissel/fpm/pull/180)
+
 0.4.2 (March 21, 2012)
   - Set default temporary directory to /tmp 
     (https://github.com/jordansissel/fpm/issues/174)

data/CONTRIBUTORS

@@ -13,3 +13,4 @@ Pieter Loubser
 Aleix Conchillo Flaqué (github: aconchillo)
 Luke Macken (github: lmacken)
 Matt Blair (github: mblair)
+Thomas Meson (github: zllak)

data/lib/fpm/package/pyfpm/get_metadata.py

@@ -77,14 +77,11 @@ class get_metadata(Command):
         groups = m.groups()
         name, cond, version = groups[0:3]
         if groups[3] is not None:
-          final_deps.append("%s %s %s" % (groups[0],
-                                          self._replace_deprecated(groups[3]),
-                                          groups[4]))
+          final_deps.append("%s %s %s" % (groups[0], groups[3], groups[4]))
+        # end if
       # end if
 
-      final_deps.append("%s %s %s" % (name,
-                                      self._replace_deprecated(cond),
-                                      version))
+      final_deps.append("%s %s %s" % (name, cond, version))
     # end for i in dependencies
 
     data["dependencies"] = final_deps
@@ -95,11 +92,5 @@ class get_metadata(Command):
     except AttributeError, e:
       # For Python 2.5 and Debian's python-json
       print json.write(data)
-
   # def run
-
-  def _replace_deprecated(self, sign):
-    """Replace deprecated operators"""
-    return {'<': '<<', '>': '>>'}.get(sign, sign)
-
 # class list_dependencies

data/lib/fpm/package/python.rb

@@ -117,8 +117,17 @@ class FPM::Package::Python < FPM::Package
 
     # Add ./pyfpm/ to the python library path
     pylib = File.expand_path(File.dirname(__FILE__))
-    setup_cmd = "env PYTHONPATH=#{pylib} #{attributes[:python_bin]} #{setup_py} --command-packages=pyfpm get_metadata"
-    output = ::Dir.chdir(File.dirname(setup_py)) { `#{setup_cmd}` }
+
+    # chdir to the directory holding setup.py because some python setup.py's assume that you are
+    # in the same directory.
+    output = ::Dir.chdir(File.dirname(setup_py)) do
+      setup_cmd = "env PYTHONPATH=#{pylib} #{attributes[:python_bin]} " \
+        "setup.py --command-packages=pyfpm get_metadata"
+      # Capture the output, which will be JSON metadata describing this python
+      # package. See fpm/lib/fpm/package/pyfpm/get_metadata.py for more
+      # details.
+      `#{setup_cmd}`
+    end
     @logger.warn("json output from setup.py", :data => output)
     metadata = JSON.parse(output[/\{.*\}/msx])
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fpm
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors: