@@ -63,8 +63,6 @@ before_install:
6363 - $NOMC || conda install --yes conda-build conda-verify jinja2 numpy
6464 - $NOMC || conda create --name=testenv --yes python=${MYPYTHON_VERSION} coverage
6565 - $NOMC || conda config --add channels diffpy
66- # FIXME - keep just the "diffpy" channel for public release.
67- - $NOMC || conda config --add channels diffpy/channel/dev
6866
6967 - $NOAPT || test "${TRAVIS_OS_NAME}" = "linux" || exit $?
7068 - $NOAPT || PATH="$(echo "$PATH" | sed 's,:/opt/pyenv/[^:]*,,g')"
@@ -103,20 +101,11 @@ install:
103101 - $NOAPT || MYSUDO=sudo
104102 - $NOSYS || $MYPIP install $MYPIPFLAGS coverage
105103 - $NOSYS || $MYPIP install $MYPIPFLAGS periodictable
106-
107- # TODO - combine after fixup release of PyCifRW following 4.3.
108- - $NOAPT || $MYPIP install $MYPIPFLAGS "pycifrw==4.2.1"
109- - $NOBREW || $MYPIP install $MYPIPFLAGS pycifrw
110-
111- - $NOAPT || $MYPIP install $MYPIPFLAGS diffpy.structure
112- # install diffpy.structure from the python3 development branch.
113- # TODO - replace with PyPI version later.
114- - $NOBREW || $MYPIP install $MYPIPFLAGS https://github.com/diffpy/diffpy.structure/archive/python3.tar.gz
104+ - $NOSYS || $MYPIP install $MYPIPFLAGS pycifrw
105+ - $NOSYS || $MYPIP install $MYPIPFLAGS diffpy.structure
115106
116107 - $NOSYS || $MYSUDO scons -C ~/pkgs/libobjcryst install
117- # TODO - restore PyPI version after fixup release of pyobjcryst > 2.0.2
118- - $NOSYS || $MYPIP install $MYPIPFLAGS https://github.com/diffpy/pyobjcryst/archive/master.tar.gz
119- # - $NOSYS || $MYPIP install $MYPIPFLAGS pyobjcryst
108+ - $NOSYS || $MYPIP install $MYPIPFLAGS pyobjcryst
120109 - $NOSYS || $MYSUDO scons -C ~/pkgs/libdiffpy install
121110 - $NOSYS || $MYPIP install $MYPIPFLAGS "${MYTARBUNDLE}"
122111
0 commit comments