"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "lib/fpm/package/pyfpm/get_metadata.py" between
fpm-1.13.1.tar.gz and fpm-1.14.0.tar.gz

About: fpm tries to make it easy and quick to build packages such as rpms, debs, OSX packages, etc.

get_metadata.py  (fpm-1.13.1):get_metadata.py  (fpm-1.14.0)
skipping to change at line 91 skipping to change at line 91
if self.load_requirements_txt: if self.load_requirements_txt:
requirement = open(self.requirements_txt).readlines() requirement = open(self.requirements_txt).readlines()
for dep in pkg_resources.parse_requirements(requirement): for dep in pkg_resources.parse_requirements(requirement):
final_deps.extend(self.process_dep(dep)) final_deps.extend(self.process_dep(dep))
else: else:
if getattr(self.distribution, 'install_requires', None): if getattr(self.distribution, 'install_requires', None):
for dep in pkg_resources.parse_requirements( for dep in pkg_resources.parse_requirements(
self.distribution.install_requires): self.distribution.install_requires):
final_deps.extend(self.process_dep(dep)) final_deps.extend(self.process_dep(dep))
if getattr(self.distribution, 'extras_require', None):
for dep in pkg_resources.parse_requirements(
v for k, v in self.distribution.extras_require.items()
if k.startswith(':') and pkg_resources.evaluate_marker(k
[1:])):
final_deps.extend(self.process_dep(dep))
data["dependencies"] = final_deps data["dependencies"] = final_deps
output = open(self.output, "w") output = open(self.output, "w")
if hasattr(json, 'dumps'): if hasattr(json, 'dumps'):
def default_to_str(obj): def default_to_str(obj):
""" Fall back to using __str__ if possible """ """ Fall back to using __str__ if possible """
# This checks if the class of obj defines __str__ itself, # This checks if the class of obj defines __str__ itself,
# so we don't fall back to an inherited __str__ method. # so we don't fall back to an inherited __str__ method.
if "__str__" in type(obj).__dict__: if "__str__" in type(obj).__dict__:
 End of changes. 1 change blocks. 
0 lines changed or deleted 6 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)