Merge lp://qastaging/~sergiusens/snapcraft/sources_for_sources into lp://qastaging/~dholbach/snapcraft/1498347
| Status: | Superseded | ||||
|---|---|---|---|---|---|
| Proposed branch: | lp://qastaging/~sergiusens/snapcraft/sources_for_sources | ||||
| Merge into: | lp://qastaging/~dholbach/snapcraft/1498347 | ||||
| Diff against target: |
1488 lines (+594/-275) 37 files modified
debian/changelog (+42/-5) debian/control (+11/-0) debian/rules (+3/-0) debian/snapcraft-examples.install (+1/-0) debian/snapcraft.install (+3/-0) debian/source/options (+0/-5) debian/tests/control (+3/-2) debian/tests/runexamples (+2/-0) debian/tests/runtests (+2/-0) docs/your-first-snap.md (+2/-2) examples/downloader-with-wiki-parts/snapcraft.yaml (+1/-0) integration-tests/data/build-tools/Makefile (+6/-0) integration-tests/data/build-tools/icon.svg (+1/-0) integration-tests/data/build-tools/snapcraft.yaml (+14/-0) integration-tests/data/pip-requirements/snapcraft.yaml (+2/-2) integration-tests/runtests.sh (+44/-17) integration-tests/units/examples.pxu (+10/-0) integration-tests/units/jobs.pxu (+37/-0) integration-tests/units/testplans.pxu (+6/-1) plugins/python2-project.yaml (+3/-3) plugins/python2.yaml (+0/-3) plugins/python3-project.yaml (+3/-3) plugins/python3.yaml (+0/-3) runtests.sh (+67/-35) snapcraft/__init__.py (+16/-0) snapcraft/cmds.py (+2/-0) snapcraft/common.py (+11/-0) snapcraft/plugin.py (+15/-19) snapcraft/plugins/go_project.py (+3/-1) snapcraft/plugins/python2.py (+0/-59) snapcraft/plugins/python2_project.py (+65/-5) snapcraft/plugins/python3.py (+0/-61) snapcraft/plugins/python3_project.py (+62/-5) snapcraft/repo.py (+83/-26) snapcraft/tests/test_plugin.py (+0/-14) snapcraft/tests/test_repo.py (+38/-0) snapcraft/yaml.py (+36/-4) |
||||
| To merge this branch: | bzr merge lp://qastaging/~sergiusens/snapcraft/sources_for_sources | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel Holbach | Pending | ||
|
Review via email:
|
|||
Commit message
Allow using local sources through an env var (mostly useful for launchpad building)
Description of the change
In launchpad, geoip does not work so our code gets stuck. For now we will use whatever the builder is using. We need a longer plan strategy for this one.
Unmerged revisions
- 209. By Sergio Schvezov
-
Be more resilient to geop failing
- 208. By Sergio Schvezov
-
Add flag to use local sources
- 207. By Sergio Schvezov
-
preparing a changelog by sergiusens approved by sergiusens,dholbach
- 206. By Michael Vogt
-
The go plugin should only download in the pull phase by mvo approved by sergiusens
- 205. By Ted Gould
-
Ensure C library configuration tools don't use system paths by ted approved by sergiusens
- 204. By Sergio Schvezov
-
Show skipped packages only once per filter by sergiusens approved by chipaca
- 203. By Sergio Schvezov
-
do NOT print in tests by sergiusens approved by fgimenez
- 202. By Sergio Schvezov
-
Make the py 2 and 3 projects smarter and have dependencies pulled during the pull phase by sergiusens approved by chipaca
- 201. By Michael Vogt
-
Add quotes around $TEST_PLAN and pass the $1 directly to run_test_plan instead of indirectly in runtests.sh by mvo approved by sergiusens,
fgimenez, dholbach - 200. By Zygmunt Krynicki
-
Add 'simple' and 'has-leftovers' flags to all integration tests job units. by zyga approved by dholbach,elopio
