Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add a user/site specified background image directory #815

Merged
merged 27 commits into from
Jan 10, 2017
Merged

Add a user/site specified background image directory #815

merged 27 commits into from
Jan 10, 2017

Commits on Nov 16, 2016

  1. Added code to include user defined backgroudn image library. 

    Code tested as an addition to Met Office cartopy install (which is currently non-standard as it uses some old dependencies).
    Malcolm Brooks authored and Malcolm Brooks committed Nov 16, 2016
    Configuration menu
    Copy the full SHA
    a8d86f8 View commit details
    Browse the repository at this point in the history

  2. Docstring and pylint tweaks

    Malcolm Brooks authored and Malcolm Brooks committed Nov 16, 2016
    Configuration menu
    Copy the full SHA
    6508da5 View commit details
    Browse the repository at this point in the history

  3. comment tidyup

    Malcolm Brooks authored and Malcolm Brooks committed Nov 16, 2016
    Configuration menu
    Copy the full SHA
    8110685 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2016

  1. Added more detail to docstring

    Malcolm Brooks authored and Malcolm Brooks committed Nov 18, 2016
    Configuration menu
    Copy the full SHA
    70e5233 View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2016

  1. Added code to include user defined backgroudn image library. 

    Code tested as an addition to Met Office cartopy install (which is currently non-standard as it uses some old dependencies).
    Malcolm Brooks authored and Malcolm Brooks committed Dec 20, 2016
    Configuration menu
    Copy the full SHA
    b67d1e8 View commit details
    Browse the repository at this point in the history

  2. Docstring and pylint tweaks

    Malcolm Brooks authored and Malcolm Brooks committed Dec 20, 2016
    Configuration menu
    Copy the full SHA
    d99867c View commit details
    Browse the repository at this point in the history

  3. comment tidyup

    Malcolm Brooks authored and Malcolm Brooks committed Dec 20, 2016
    Configuration menu
    Copy the full SHA
    e1df367 View commit details
    Browse the repository at this point in the history

  4. Added more detail to docstring

    Malcolm Brooks authored and Malcolm Brooks committed Dec 20, 2016
    Configuration menu
    Copy the full SHA
    3259554 View commit details
    Browse the repository at this point in the history

  5. Added the background_img code again. 

    Conflicts:

	lib/cartopy/mpl/geoaxes.py
    Malcolm Brooks authored and Malcolm Brooks committed Dec 20, 2016
    Configuration menu
    Copy the full SHA
    dd63e87 View commit details
    Browse the repository at this point in the history

  6. pep8 'readability' changes

    Malcolm Brooks authored and Malcolm Brooks committed Dec 20, 2016
    Configuration menu
    Copy the full SHA
    2a8b846 View commit details
    Browse the repository at this point in the history

  7. Filename fix

    Malcolm Brooks authored and Malcolm Brooks committed Dec 20, 2016
    Configuration menu
    Copy the full SHA
    b9a114e View commit details
    Browse the repository at this point in the history

  8. One last pep8 compliance test with ugly workaround

    Malcolm Brooks authored and Malcolm Brooks committed Dec 20, 2016
    Configuration menu
    Copy the full SHA
    6065e33 View commit details
    Browse the repository at this point in the history

  9. pep8 wants two lines between tests

    Malcolm Brooks authored and Malcolm Brooks committed Dec 20, 2016
    Configuration menu
    Copy the full SHA
    e2e001b View commit details
    Browse the repository at this point in the history

  10. Changed test to refer to per-existing image

    Malcolm Brooks authored and Malcolm Brooks committed Dec 20, 2016
    Configuration menu
    Copy the full SHA
    327b035 View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2016

  1. Update images.json

    Malcolm Brooks authored Dec 29, 2016
    Configuration menu
    Copy the full SHA
    d8c888d View commit details
    Browse the repository at this point in the history

  2. Update geoaxes.py

    Malcolm Brooks authored Dec 29, 2016
    Configuration menu
    Copy the full SHA
    5f3d108 View commit details
    Browse the repository at this point in the history

  3. Update test_images.py

    Malcolm Brooks authored Dec 29, 2016
    Configuration menu
    Copy the full SHA
    d17863a View commit details
    Browse the repository at this point in the history

  4. Update geoaxes.py

    Malcolm Brooks authored Dec 29, 2016
    Configuration menu
    Copy the full SHA
    6e022b5 View commit details
    Browse the repository at this point in the history

  5. Update geoaxes.py

    Malcolm Brooks authored Dec 29, 2016
    Configuration menu
    Copy the full SHA
    46bfacd View commit details
    Browse the repository at this point in the history

  6. Update geoaxes.py

    Malcolm Brooks authored Dec 29, 2016
    Configuration menu
    Copy the full SHA
    3dbbfaa View commit details
    Browse the repository at this point in the history

  7. Merge branch 'background_img' of github.com:malcolmbrooks/cartopy int… 

    …o background_img

Conflicts:
	lib/cartopy/mpl/geoaxes.py
    Malcolm Brooks authored and Malcolm Brooks committed Dec 29, 2016
    Configuration menu
    Copy the full SHA
    0c5f85c View commit details
    Browse the repository at this point in the history

  8. Update geoaxes.py

    Malcolm Brooks authored Dec 29, 2016
    Configuration menu
    Copy the full SHA
    f6badcc View commit details
    Browse the repository at this point in the history

  9. Update geoaxes.py

    Malcolm Brooks authored Dec 29, 2016
    Configuration menu
    Copy the full SHA
    b6cb0f1 View commit details
    Browse the repository at this point in the history

Commits on Dec 30, 2016

  1. Update geoaxes.py

    Malcolm Brooks authored Dec 30, 2016
    Configuration menu
    Copy the full SHA
    905a160 View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2017

  1. Pep8 conformance 

    Merge branch 'background_img' of github.com:malcolmbrooks/cartopy into background_img

Conflicts:
	lib/cartopy/mpl/geoaxes.py
    Malcolm Brooks authored and Malcolm Brooks committed Jan 3, 2017
    Configuration menu
    Copy the full SHA
    ec0d636 View commit details
    Browse the repository at this point in the history

  2. License needs to include year of change

    Malcolm Brooks authored and Malcolm Brooks committed Jan 3, 2017
    Configuration menu
    Copy the full SHA
    f85b8cc View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2017

  1. Update geoaxes.py

    Malcolm Brooks authored Jan 6, 2017
    Configuration menu
    Copy the full SHA
    580e965 View commit details
    Browse the repository at this point in the history