Merge lp:~dobey/dirspec/setup-metdata into lp:dirspec

Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 14
Merged at revision: 14
Proposed branch: lp:~dobey/dirspec/setup-metdata
Merge into: lp:dirspec
Diff against target: 15 lines (+3/-1)
1 file modified
setup.py (+3/-1)
To merge this branch: bzr merge lp:~dobey/dirspec/setup-metdata
Reviewer Review Type Date Requested Status
Diego Sarmentero (community) Approve
Review via email: mp+127044@code.launchpad.net

Commit message

Add a little missing metadata to the setup function

To post a comment you must log in.
Revision history for this message
Diego Sarmentero (diegosarmentero) wrote :

+1

review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (6.0 KiB)

The attempt to merge lp:~dobey/dirspec/setup-metdata into lp:dirspec failed. Below is the output from the failed tests.

running build
running build_py
creating build
creating build/lib.linux-x86_64-2.7
creating build/lib.linux-x86_64-2.7/dirspec
copying dirspec/basedir.py -> build/lib.linux-x86_64-2.7/dirspec
copying dirspec/__init__.py -> build/lib.linux-x86_64-2.7/dirspec
copying dirspec/utils.py -> build/lib.linux-x86_64-2.7/dirspec
running test
running egg_info
creating dirspec.egg-info
writing dirspec.egg-info/PKG-INFO
writing top-level names to dirspec.egg-info/top_level.txt
writing dependency_links to dirspec.egg-info/dependency_links.txt
writing manifest file 'dirspec.egg-info/SOURCES.txt'
reading manifest file 'dirspec.egg-info/SOURCES.txt'
reading manifest template 'MANIFEST.in'
writing manifest file 'dirspec.egg-info/SOURCES.txt'
running build_ext

+ python ./setup.py build test clean
test_cache_home (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_cache_home ... ok
test_config_dirs (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_config_dirs ... ok
test_config_home (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_config_home ... ok
test_data_dirs (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_data_dirs ... ok
test_data_home (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_data_home ... ok
test_default_cache_home (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_default_cache_home ... ok
test_default_config_dirs (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_default_config_dirs ... ok
test_default_config_home (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_default_config_home ... ok
test_default_data_dirs (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_default_data_dirs ... ok
test_default_data_home (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_default_data_home ... ok
test_load_config_paths_filter (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_load_config_paths_filter ... ok
test_save_config_path (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_save_config_path ... ok
test_xdg_cache_home_is_utf8_bytes (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_xdg_cache_home_is_utf8_bytes ... ok
test_xdg_config_dirs_are_bytes (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_xdg_config_dirs_are_bytes ... ok
test_xdg_config_home_is_utf8_bytes (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_xdg_config_home_is_utf8_bytes ... ok
test_xdg_data_dirs_are_bytes (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_xdg_data_dirs_are_bytes ... ok
test_xdg...

Read more...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'setup.py'
--- setup.py 2012-07-12 19:42:16 +0000
+++ setup.py 2012-09-28 18:22:26 +0000
@@ -20,8 +20,10 @@
20setup(20setup(
21 name='dirspec',21 name='dirspec',
22 version='4.1',22 version='4.1',
23 packages=['dirspec'],
24 description='XDG Base and User directories implementation',23 description='XDG Base and User directories implementation',
24 license='GNU LGPL v3',
25 url='https://launchpad.net/dirspec',25 url='https://launchpad.net/dirspec',
26 download_url='https://launchpad.net/dirspec/+download',
27 packages=['dirspec'],
26 test_suite='dirspec.tests',28 test_suite='dirspec.tests',
27 )29 )

Subscribers

People subscribed via source and target branches

to all changes: