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

trim attributes to number of lines plotted, fix #32 #33

Merged
merged 4 commits into from
Oct 4, 2018
Merged

trim attributes to number of lines plotted, fix #32 #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1fa3147
trim attributes to number of lines plotted, fix #32
doutriaux1 Oct 3, 2018
871fffb
correct oroder for py2 py3 and correct channel for conda
doutriaux1 Oct 3, 2018
8d0d868
trying to use cdat-forge channel
doutriaux1 Oct 3, 2018
b5363dc
Update .travis.yml
doutriaux1 Oct 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@ aliases:
name: create_conda_env
environment:
PKGS: "cdms2 mesalib matplotlib 'numpy>1.14' vcs 'proj4<5' testsrunner"
CHANNELS: "-c cdat/label/nightly -c conda-forge -c cdat"
CHANNELS: "-c cdat/label/nightly -c cdat-forge -c conda-forge -c cdat"
command: |
export PATH=$WORKDIR/miniconda/bin:$PATH
conda config --set always_yes yes --set changeps1 no
conda update -y -q conda
conda config --set anaconda_upload no
if [[ $PY_VER = "py2" ]]; then
conda create -q -n $PY_VER $CHANNELS $PKGS 'python>3' $FFMPEG ${CONDA_COMPILERS}
conda create -q -n $PY_VER $CHANNELS $PKGS 'python<3' $FFMPEG ${CONDA_COMPILERS}
else
conda create -q -n $PY_VER $CHANNELS $PKGS 'python<3' $FFMPEG ${CONDA_COMPILERS} $COVERAGE_PKGS
conda create -q -n $PY_VER $CHANNELS $PKGS 'python>3' $FFMPEG ${CONDA_COMPILERS} $COVERAGE_PKGS
fi

- &setup_vcsaddons
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ script:
- export UVCDAT_SETUP_PATH=${HOME}
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then export COMPILERS=gcc_linux-64; export LDSHARED_FLAGS="-shared -pthread" ; fi
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then export COMPILERS=clang_osx-64; export LDSHARED_FLAGS="-bundle -undefined dynamic_lookup" ; fi
- conda create -q -n py2 -c cdat/label/nightly -c conda-forge -c cdat cdms2 testsrunner matplotlib mesalib vcs "proj4<5" "python<3" ${COMPILERS}
- conda create -q -n py3 -c cdat/label/nightly -c conda-forge -c cdat cdms2 testsrunner matplotlib mesalib vcs "proj4<5" "python>3" ${COMPILERS}
- conda create -q -n py2 -c cdat/label/nightly -c cdat-forge -c conda-forge -c cdat cdms2 testsrunner matplotlib mesalib vcs "proj4<5" "python<3" ${COMPILERS}
- conda create -q -n py3 -c cdat/label/nightly -c cdat-forge -c conda-forge -c cdat cdms2 testsrunner matplotlib mesalib vcs "proj4<5" "python>3" ${COMPILERS}
- echo $TRAVIS_BRANCH
- export TRAVIS_PR_BRANCH=$TRAVIS_BRANCH
- echo $TRAVIS_EVENT_TYPE
Expand Down
7 changes: 6 additions & 1 deletion Lib/parallelCoordinates.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ def list(self):
print('datawc_y2 = ', self.datawc_y2)
print('xmtics1 = ', self.xmtics1)
print('xmtics2 = ', self.xmtics2)
print('ymtics = ', self.ymtics)
print('xticlabels1 = ', self.xticlabels1)
print('xticlabels2 = ', self.xticlabels2)
print('yticlabels = ', self.yticlabels)
Expand Down Expand Up @@ -304,6 +303,12 @@ def plot(self, array, template=None, bg=False, render=True, x=None):
else:
scratched.append(True)
# Now draws the legend
linecolors = linecolors[:nlines]
linetypes = linetypes[:nlines]
linewidths = linewidths[:nlines]
markercolors = markercolors[:nlines]
markersizes = markersizes[:nlines]
markertypes = markertypes[:nlines]
t.drawLinesAndMarkersLegend(x,
linecolors, linetypes, linewidths, # noqa
markercolors, markertypes, markersizes, # noqa
Expand Down