Page MenuHomeSoftware Heritage
Differential D2397

loader.cli: Reference new cli
ClosedPublic
Actions

Authored by ardumont on Dec 4 2019, 7:45 PM.

Details

Reviewers
douardda
anlambert
Group Reviewers
Reviewers
Commits
rDLDBASEa57a535e17bb: tests: Refactor using pytest-mock's mocker fixture
rDLDBASEa046207f1e56: requirements-test: Add missing test dependency
rDLDBASE7e93d9e99770: loader.cli: Add tests around cli
rDLDBASEbb0e7a231fcb: package.npm: Align loader instantiation
rDLDBASEa8cc131a28c2: loader.cli: Reference new loader cli
Summary

This installs a swh loader subcommand.
This allows loading of url for a given loader.

This also aligns the npm loader's constructor to be consistent with other
loaders (having only one url as constructor parameter).

Related to T2134

Diff Detail

Repository
rDLDBASE Generic VCS/Package Loader
Branch
add-loader-cli-2
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 9536
Build 14039: tox-on-jenkinsJenkins
Build 14038: arc lint + arc unit

Event Timeline

ardumont created this revision.Dec 4 2019, 7:45 PM
Harbormaster failed remote builds in B9519: Diff 8440!Dec 4 2019, 7:46 PM
swh-public-ci added a comment.Dec 4 2019, 7:46 PM

Build has FAILED

Link to build: https://jenkins.softwareheritage.org/job/DLDBASE/job/tox/257/
See console output for more information: https://jenkins.softwareheritage.org/job/DLDBASE/job/tox/257/console

ardumont edited the summary of this revision. (Show Details)Dec 4 2019, 7:46 PM
ardumont edited the summary of this revision. (Show Details)Dec 4 2019, 7:48 PM
ardumont added projects: SWH command line interface, Core Loader.
ardumont edited the summary of this revision. (Show Details)Dec 5 2019, 8:26 AM
ardumont retitled this revision from loader.cli: Reference new loader cli to loader.cli: Reference new cli.Dec 5 2019, 9:37 AM
ardumont updated this revision to Diff 8441.EditedDec 5 2019, 9:38 AM
  • loader.cli: Add tests around cli

(that still cannot pass green here though, need to land the loaders' first D2395)

Harbormaster failed remote builds in B9520: Diff 8441!Dec 5 2019, 9:38 AM
swh-public-ci added a comment.Dec 5 2019, 9:38 AM

Build has FAILED

Link to build: https://jenkins.softwareheritage.org/job/DLDBASE/job/tox/258/
See console output for more information: https://jenkins.softwareheritage.org/job/DLDBASE/job/tox/258/console

ardumont updated this revision to Diff 8450.Dec 5 2019, 12:35 PM
  • loader.cli: Reference new loader cli
  • package.npm: Align loader instantiation
  • loader.cli: Add tests around cli
swh-public-ci added a comment.Dec 5 2019, 12:36 PM

Build has FAILED

Link to build: https://jenkins.softwareheritage.org/job/DLDBASE/job/tox/261/
See console output for more information: https://jenkins.softwareheritage.org/job/DLDBASE/job/tox/261/console

Harbormaster failed remote builds in B9529: Diff 8450!Dec 5 2019, 12:36 PM
ardumont mentioned this in D2398: svn: Unify loader constructor + register worker (tasks, cli).Dec 5 2019, 2:22 PM
ardumont updated this revision to Diff 8452.Dec 5 2019, 2:27 PM
  • requirements-test: Add missing test dependency
swh-public-ci added a comment.Dec 5 2019, 2:29 PM

Build is green
See https://jenkins.softwareheritage.org/job/DLDBASE/job/tox/262/ for more details.

Harbormaster completed remote builds in B9531: Diff 8452.Dec 5 2019, 2:29 PM
ardumont updated this revision to Diff 8456.Dec 5 2019, 4:09 PM

Rebase on latest master

swh-public-ci added a comment.Dec 5 2019, 4:10 PM

Build is green
See https://jenkins.softwareheritage.org/job/DLDBASE/job/tox/263/ for more details.

Harbormaster completed remote builds in B9536: Diff 8456.Dec 5 2019, 4:10 PM
ardumont mentioned this in T2134: loader: Implement uniform loading CLI.Dec 6 2019, 10:04 AM
ardumont edited the summary of this revision. (Show Details)Dec 6 2019, 11:47 AM
anlambert accepted this revision.Dec 6 2019, 1:21 PM
anlambert added a subscriber: anlambert.

Looks good to me !

swh/loader/cli.py
61

Load an origin from its url with loader <name>

swh/loader/package/npm/loader.py
49

nitpick: it's better to use concrete type (here Dict) when typing return value

swh/loader/tests/test_cli.py
82

Triggering

85

this should be removed I think

93

same here

This revision is now accepted and ready to land.Dec 6 2019, 1:21 PM
ardumont updated this revision to Diff 8475.Dec 6 2019, 1:45 PM

Adapt according to review

swh-public-ci added a comment.Dec 6 2019, 1:46 PM

Build is green
See https://jenkins.softwareheritage.org/job/DLDBASE/job/tox/265/ for more details.

Harbormaster completed remote builds in B9558: Diff 8475.Dec 6 2019, 1:46 PM
ardumont updated this revision to Diff 8476.EditedDec 6 2019, 1:53 PM

Adapt according to review (i missed one)

swh-public-ci added a comment.Dec 6 2019, 1:54 PM

Build has FAILED

Link to build: https://jenkins.softwareheritage.org/job/DLDBASE/job/tox/266/
See console output for more information: https://jenkins.softwareheritage.org/job/DLDBASE/job/tox/266/console

Harbormaster failed remote builds in B9559: Diff 8476!Dec 6 2019, 1:54 PM
ardumont updated this revision to Diff 8477.Dec 6 2019, 2:04 PM
  • Fix test on cli (forgot to amend the test after changing the cli's help message)
  • Use pytest-mock's mocker fixture in tests needing to patch behavior
ardumont added inline comments.Dec 6 2019, 2:05 PM
requirements-test.txt
1

It's packaged in debian stable so ok: python3-pytest-mock ;)

swh-public-ci added a comment.Dec 6 2019, 2:06 PM

Build is green
See https://jenkins.softwareheritage.org/job/DLDBASE/job/tox/267/ for more details.

Harbormaster completed remote builds in B9560: Diff 8477.Dec 6 2019, 2:06 PM
ardumont updated this revision to Diff 8478.Dec 6 2019, 2:06 PM

Plug to master branch

anlambert added inline comments.Dec 6 2019, 2:08 PM
swh/loader/tests/test_cli.py
80

Still this one to replace with mocker fixture

swh-public-ci added a comment.Dec 6 2019, 2:08 PM

Build is green
See https://jenkins.softwareheritage.org/job/DLDBASE/job/tox/268/ for more details.

Harbormaster completed remote builds in B9561: Diff 8478.Dec 6 2019, 2:08 PM
ardumont updated this revision to Diff 8479.Dec 6 2019, 2:10 PM

Migrate last test with mocker fixture (missed)

swh-public-ci added a comment.Dec 6 2019, 2:12 PM

Build is green
See https://jenkins.softwareheritage.org/job/DLDBASE/job/tox/269/ for more details.

Harbormaster completed remote builds in B9562: Diff 8479.Dec 6 2019, 2:12 PM
Closed by commit rDLDBASEa8cc131a28c2: loader.cli: Reference new loader cli (authored by ardumont). · Explain WhyDec 6 2019, 2:17 PM
This revision was automatically updated to reflect the committed changes.
ardumont added a commit: rDLDBASEa8cc131a28c2: loader.cli: Reference new loader cli.
ardumont added a commit: rDLDBASEbb0e7a231fcb: package.npm: Align loader instantiation.
ardumont added a commit: rDLDBASE7e93d9e99770: loader.cli: Add tests around cli.
ardumont added a commit: rDLDBASEa046207f1e56: requirements-test: Add missing test dependency.
ardumont added a commit: rDLDBASEa57a535e17bb: tests: Refactor using pytest-mock's mocker fixture.

Revision Contents
Changeset List

PathSize
1 line
1 line
2 lines
swh/
loader/
68 lines
package/
archive/
2 lines
debian/
2 lines
deposit/
2 lines
npm/
2 lines
23 lines
4 lines
tests/
13 lines
4 lines
pypi/
2 lines
tests/
24 lines
93 lines

Diff 8456

View Options

requirements-swh.txt

Loading...
View Options

requirements-test.txt

Loading...
View Options

setup.py

Loading...
View Options

swh/loader/cli.py

Loading...
View Options

swh/loader/package/archive/__init__.py

Loading...
View Options

swh/loader/package/debian/__init__.py

Loading...
View Options

swh/loader/package/deposit/__init__.py

Loading...
View Options

swh/loader/package/npm/__init__.py

Loading...
View Options

swh/loader/package/npm/loader.py

Loading...
View Options

swh/loader/package/npm/tasks.py

Loading...
View Options

swh/loader/package/npm/tests/test_npm.py

Loading...
View Options

swh/loader/package/npm/tests/test_tasks.py

Loading...
View Options

swh/loader/package/pypi/__init__.py

Loading...
View Options

swh/loader/tests/__init__.py

Loading...
View Options

swh/loader/tests/conftest.py

Loading...
View Options

swh/loader/tests/test_cli.py

Loading...
About · Developer information · Legal