Skip to content
Snippets Groups Projects

Normalize the handling of the config file loading in cli

Depends on !66 (closed).


Migrated from D3063 (view on Phabricator)

Merge request reports

Approved by

Closed by Phabricator Migration userPhabricator Migration user 4 years ago (Apr 27, 2020 1:20pm UTC)

Merge details

  • The changes were not merged into generated-differential-D3063-target.

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Build is green

    Patch application report for D3063 (id=10896)

    Could not rebase; Attempt merge onto 17f81a70...

    Updating 17f81a7..ca38cdf
    Fast-forward
     swh/objstorage/__init__.py                         | 107 ++------------------
     swh/objstorage/api/server.py                       |  20 +++-
     swh/objstorage/cli.py                              |  21 +++-
     swh/objstorage/factory.py                          | 108 +++++++++++++++++++++
     swh/objstorage/tests/test_multiplexer_filter.py    |   2 +-
     swh/objstorage/tests/test_objstorage_api.py        |   2 +-
     swh/objstorage/tests/test_objstorage_azure.py      |   2 +-
     swh/objstorage/tests/test_objstorage_in_memory.py  |   2 +-
     .../tests/test_objstorage_instantiation.py         |   2 +-
     .../tests/test_objstorage_multiplexer.py           |   2 +-
     .../tests/test_objstorage_pathslicing.py           |   4 +-
     .../tests/test_objstorage_random_generator.py      |   2 +-
     swh/objstorage/tests/test_objstorage_striping.py   |   2 +-
     13 files changed, 158 insertions(+), 118 deletions(-)
     create mode 100644 swh/objstorage/factory.py
    Changes applied before test
    commit ca38cdf58b472582fe96aed1da453753376649a7
    Author: David Douard <david.douard@sdfa3.org>
    Date:   Fri Apr 24 15:44:18 2020 +0200
    
        Normalize the handling of the config file loading in cli
    
    commit 68d01a09251b18de3c6a865d7c2fcbe0b1a6af8f
    Author: David Douard <david.douard@sdfa3.org>
    Date:   Fri Apr 24 15:39:35 2020 +0200
    
        Move the content of swh/objstorage/__init__.py in swh/objstorage/factory.py
        
        This is needed to "empty" the swh.objstorage's *module* from any
        non-subpackage objects, so we can implement the swh.objstorage.replayer
        outside the swh.objstorage's repo, in a dedicated repo/project.

    See https://jenkins.softwareheritage.org/job/DOBJS/job/tests-on-diff/4/ for more details.

  • Fine.

    Some comments/suggestion in the diff.

  • Merge request was accepted

  • Antoine R. Dumont approved this merge request

    approved this merge request

  • Author Maintainer

    closed by 3043177f

  • Author Maintainer

    Merge request was merged

  • closed

Please register or sign in to reply
Loading