Code review comment for lp:~abentley/juju-ci-tools/python-canary

Revision history for this message
Aaron Bentley (abentley) wrote :

> I think this breaks "make test" on windows and the osx slave. I do run this
> command to be certain the scripts can run on those hosts. Can we the apt-calls
> for non-ubuntu?

I've changed it so that pip is one of the packages installed by install-deps, instead of being handled separately. Basically, if you don't install-deps, you're responsible for installing pip.

This gives PYTHON_PACKAGE_CANARY a dependency on apt-deps, but this is an *ordering* dependency-- if make was going to run apt-deps anyhow, it runs it before PYTHON_PACKAGE_CANARY. But it won't run apt-deps unless another target (like install-deps) is required.

So:
  make install-deps:
    1. make apt-deps
    2. make python-deps

  make test
    1. make python-deps
    2. python -m unittest ...

I think this addresses the concern of unwanted apt operations on Windows and Mac and also fixes the problem that pip wasn't being handled the same way as other debian packages.

Does that work for you?

« Back to merge proposal