Ar6 colors

.travis.yml

@@ -3,13 +3,13 @@ language: sh
 matrix:
     include:
         - os: linux
-          env: PYENV=py37
+          env: PYENV=py36
         - os: linux
-          env: PYENV=py27
-        - os: osx
           env: PYENV=py37
         - os: osx
-          env: PYENV=py27
+          env: PYENV=py36
+        - os: osx
+          env: PYENV=py37
 # Observed on 10-Feb-19, choclatey builds for miniconda3 break
 # see: https://github.com/conda/conda/issues/6064
 # It is not clear how/when this can be fixed, so turn this back off for now
@@ -21,17 +21,21 @@ matrix:
 
 before_install:
   - source ./ci/env.sh
-  - bash ./ci/travis-install.sh
+  - bash ./ci/travis-install-miniconda.sh
+  - conda create -n testing python=$PYVERSION --yes
   - source activate testing
-  - make virtual-environment
+  - make -B virtual-environment
 
 install:
   - make install
 
 script:
-  - python -c "import os, sys; assert os.environ['PYVERSION'] == sys.version[0]"
+  - conda list
+  - python -c "import os; print(os.environ['PYVERSION'])"
+  - python -c "import sys; print(sys.version)"
+  - python -c "import os, sys; assert os.environ['PYVERSION'] == '.'.join([sys.version[0], sys.version[2]])"
   - make test
-  # silly problems are there for building docs in windows and py2 (tries to look for py3 jupyter kernel)
+  # only test docs once to make sure everything works on most recent python
   - cd doc
   - if [[ "${PYENV}" == "py37" && "${TRAVIS_OS_NAME}" != 'windows' ]]; then make html; fi
   - cd ..

Makefile

@@ -1,5 +1,9 @@
 .DEFAULT_GOAL := help
 
+CI_DIR=./ci
+CI_ENVIRONMENT_CONDA_DEFAULT_FILE=$(CI_DIR)/environment-conda-default.txt
+CI_ENVIRONMENT_CONDA_FORGE_FILE=$(CI_DIR)/environment-conda-forge.txt
+
 
 ifndef CONDA_PREFIX
 $(error Conda not active, please install conda and then activate it using \`conda activate\`))
@@ -10,7 +14,6 @@ endif
 VENV_DIR=$(CONDA_PREFIX)
 endif
 
-
 define PRINT_HELP_PYSCRIPT
 import re, sys
 
@@ -80,19 +83,15 @@ docs: $(VENV_DIR)  ## make the docs
 
 .PHONY: virtual-environment
 virtual-environment: $(VENV_DIR)  ## make virtual environment for development
+
+$(VENV_DIR):  $(CI_ENVIRONMENT_CONDA_DEFAULT_FILE) $(CI_ENVIRONMENT_CONDA_FORGE_FILE)
 	# TODO: unify with ci install instructions somehow
-	$(CONDA_EXE) install --yes $(shell cat ci/environment-conda-default.txt | tr '\n' ' ')
-	$(CONDA_EXE) install --yes -c conda-forge $(shell cat ci/environment-conda-forge.txt | tr '\n' ' ')
-	# do matplotlib version fiddling for making plots
-	$(CONDA_EXE) uninstall --yes --force matplotlib
+	$(CONDA_EXE) install --yes $(shell cat $(CI_ENVIRONMENT_CONDA_DEFAULT_FILE) | tr '\n' ' ')
+	$(CONDA_EXE) install --yes -c conda-forge $(shell cat $(CI_ENVIRONMENT_CONDA_FORGE_FILE) | tr '\n' ' ')
 	# Install development setup
 	$(VENV_DIR)/bin/pip install -e .[tests,deploy]
-	# do matplotlib version fiddling for making plots (part 2)
-	$(VENV_DIR)/bin/pip uninstall -y matplotlib
-	$(VENV_DIR)/bin/pip install matplotlib==2.1.2
-	touch $(VENV_DIR)
 	# install docs requirements
-	cd doc; pip install -r requirements.txt
+	cd doc; $(VENV_DIR)/bin/pip install -r requirements.txt
 
 .PHONY: release-on-conda
 release-on-conda:  ## release pyam on conda

appveyor.yml

@@ -1,12 +1,12 @@
 
 environment:
   matrix:
-      - PYTHON_VERSION: "2.7"
-        MINICONDA: "C:\\Miniconda-x64"
-        PYTHON_ARCH: "64"
       - PYTHON_VERSION: "3.6"
         MINICONDA: "C:\\Miniconda36-x64"
         PYTHON_ARCH: "64"
+      - PYTHON_VERSION: "3.7"
+        MINICONDA: "C:\\Miniconda37-x64"
+        PYTHON_ARCH: "64"
 
 init:
   - "ECHO %PYTHON_VERSION% %MINICONDA%"
@@ -20,14 +20,19 @@ install:
   - set "CONDA_ROOT=C:\Miniconda%BASE_PYTHON_VERSION%%ARCH_LABEL%"
   - set "PATH=%CONDA_ROOT%;%CONDA_ROOT%\Scripts;%CONDA_ROOT%\Library\bin;%PATH%"
 
-  # Dependencies and package install
-  - conda install --yes geopandas cartopy
-  - if "%PYTHON_VERSION%" == "2.7" pip install functools32
+  # create conda environment
+  - conda update --yes conda
+  - conda create -n testing python="%PYTHON_VERSION%" --yes
+  - conda --version
+  - activate testing
+  - conda install -y numpy pandas pyyaml xlrd xlsxwriter matplotlib==3.0.3 seaborn==0.9.0 six requests jupyter nbconvert
+  - conda install -y -c conda-forge libiconv gdal fiona geopandas cartopy
 
 build: false
 
 test_script:
-  - pip install -e .[tests]
+  - conda list
+  - pip install -e .[tests,deploy]
   - pytest -v --mpl tests --mpl-results-path=test-artifacts
 
 artifacts:

ci/env.sh

@@ -16,18 +16,23 @@ case "${TRAVIS_OS_NAME}" in
 esac
 
 case "${PYENV}" in
-    py27)
-        export PYVERSION=2
-        export CHOCOPATH='miniconda2'
-        export CHOCONAME='miniconda'
+    py35)
+        export PYVERSION=3.5
+        export CHOCOPATH='miniconda3'
+        export CHOCONAME='miniconda3'
+    ;;
+    py36)
+        export PYVERSION=3.6
+        export CHOCOPATH='miniconda3'
+        export CHOCONAME='miniconda3'
     ;;
     py37)
-        export PYVERSION=3
+        export PYVERSION=3.7
         export CHOCOPATH='miniconda3'
         export CHOCONAME='miniconda3'
     ;;
 esac
-export URL="https://repo.anaconda.com/miniconda/Miniconda$PYVERSION-latest-$OSNAME-x86_64.$EXT"
+export URL="https://repo.anaconda.com/miniconda/Miniconda3-latest-$OSNAME-x86_64.$EXT"
 
 if [[ "$TRAVIS_OS_NAME" != 'windows' ]]; then
     export PATH=$HOME/miniconda/bin:$PATH

ci/environment-conda-default.txt

@@ -1,10 +1,10 @@
-numpy==1.14.0
-pandas==0.22.0
+numpy
+pandas
 pyyaml
 xlrd
 xlsxwriter
-matplotlib==2.1.2
-seaborn==0.8.1
+matplotlib==3.0.3
+seaborn==0.9.0
 six
 requests
 jupyter

ci/environment-conda-forge.txt

@@ -1,3 +1,4 @@
+libiconv
 gdal
 fiona
 geopandas

ci/travis-install.sh → ci/travis-install-miniconda.sh

@@ -20,5 +20,3 @@ fi
 # update conda
 conda update --yes conda
 
-# create named env
-conda create -n testing python=$PYVERSION --yes

doc/requirements.txt

@@ -9,4 +9,5 @@ cloud_sptheme
 nbformat
 ipython
 jupyter
+jupyter_contrib_nbextensions
 pillow

pyam/plotting.py

@@ -49,6 +49,28 @@
     'bottom': dict(loc='upper center', bbox_to_anchor=(0.5, -0.2), ncol=3),
 }
 
+PYAM_COLORS = {
+    'AR6-SSP1-1.9': "#00AAD0",
+    'AR6-SSP1-2.6': "#003466",
+    'AR6-SSP2-4.5': "#EF550F",
+    'AR6-SSP3-7.0': "#E00000",
+    'AR6-SSP3-LowNTCF': "#E00000",
+    'AR6-SSP4-3.4': "#FFA900",
+    'AR6-SSP4-6.0': "#C47900",
+    'AR6-SSP5-3.4-OS': "#7F006E",
+    'AR6-SSP5-8.5': "#990002",
+    'AR6-RCP-2.6': "#003466",
+    'AR6-RCP-4.5': "#5492CD",
+    'AR6-RCP-6.0': "#C47900",
+    'AR6-RCP-8.5': "#990002",
+    # AR5 colours from
+    # https://tdaviesbarnard.co.uk/1202/ipcc-official-colors-rcp/
+    'AR5-RCP-2.6': "#0000FF",
+    'AR5-RCP-4.5': "#79BCFF",
+    'AR5-RCP-6.0': "#FF822D",
+    'AR5-RCP-8.5': "#FF0000",
+}
+
 
 def reset_default_props(**kwargs):
     """Reset properties to initial cycle point"""
@@ -110,6 +132,22 @@ def assign_style_props(df, color=None, marker=None, linestyle=None,
                     props_for_kind[val] = next(defaults[kind])
             props[kind] = props_for_kind
 
+    # update for special properties only if they exist in props
+    if 'color' in props:
+        d = props['color']
+        values = list(d.values())
+        # find if any colors in our properties corresponds with special colors
+        # we know about
+        overlap_idx = np.in1d(values, list(PYAM_COLORS.keys()))
+        if overlap_idx.any():  # some exist in our special set
+            keys = np.array(list(d.keys()))[overlap_idx]
+            values = np.array(values)[overlap_idx]
+            # translate each from pyam name, like AR6-SSP2-45 to proper color
+            # designation
+            for k, v in zip(keys, values):
+                d[k] = PYAM_COLORS[v]
+            # replace props with updated dict without special colors
+            props['color'] = d
     return props
 
 

tests/test_plotting.py

@@ -3,15 +3,18 @@
 import os
 import copy
 import numpy as np
+import pandas as pd
 import pyam
-
+import warnings
 
 # on CI, freetype version 2.6.1 works, but 2.8.0 does not
 # if we want to move to 2.8.0, then we will need to regenerate images
 FREETYPE_VERSION = matplotlib.ft2font.__freetype_version__
-if int(FREETYPE_VERSION.replace('.', '')) > 261:
-    pytest.skip('Freetype version > 2.6.1: {}'.format(FREETYPE_VERSION),
-                allow_module_level=True)
+if int(FREETYPE_VERSION.replace('.', '')) < 291:
+    msg = 'Freetype version < 2.9.1: {}'.format(FREETYPE_VERSION)
+    warnings.warn('test_plotting.py is being skipped due to a '
+                  'Freetype Version mismatch: {}'.format(msg))
+    pytest.skip(msg, allow_module_level=True)
 
 try:
     import cartopy
@@ -82,6 +85,31 @@ def test_line_color(plot_df):
     return fig
 
 
+@pytest.mark.mpl_image_compare(**MPL_KWARGS)
+def test_line_PYAM_COLORS(plot_df):
+    # add a family of lines for each color in plotting.PYAM_COLORS separated by
+    # a small offset
+    update = {'color': {'model': {}}}
+    _df = plot_df.filter(
+        model='test_model',
+        variable='Primary Energy',
+        scenario='test_scenario1',
+    ).data.copy()
+    dfs = []
+    for i, color in enumerate(plotting.PYAM_COLORS):
+        df = _df.copy()
+        model = color
+        df['model'] = model
+        df['value'] += i
+        update['color']['model'][model] = color
+        dfs.append(df)
+    df = pyam.IamDataFrame(pd.concat(dfs))
+    fig, ax = plt.subplots(figsize=(8, 8))
+    with update_run_control(update):
+        df.line_plot(ax=ax, color='model', legend=True)
+    return fig
+
+
 @pytest.mark.mpl_image_compare(**MPL_KWARGS)
 def test_line_color_fill_between(plot_df):
     fig, ax = plt.subplots(figsize=(8, 8))