Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 7 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,27 @@ env:
- TWINE_USERNAME="mwcraig"
matrix:
- CONDA_PY=3.6
- CONDA_PY=3.7
- CONDA_PY=3.7.3 # 3.7.4 on conda is broken

install:
# Install and set up miniconda.
- if [ $TRAVIS_OS_NAME == "linux" ]; then wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh; fi
- if [ $TRAVIS_OS_NAME == "osx" ]; then wget http://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh; fi
- bash miniconda.sh -b -p $CONDA_INSTALL_LOCN
- export PATH=${CONDA_INSTALL_LOCN}/bin:$PATH
- $CONDA_INSTALL_LOCN/bin/conda init bash
- source ~/.bash_profile
- conda activate base
- conda config --set always_yes true

# Gets us vpnotebook
- conda config --add channels vpython
- conda config --append channels conda-forge

- conda update --quiet conda
- conda install conda python=$CONDA_PY

# Install a couple of dependencies we need for sure.
# Not sure why cython is necessary since it is listed as a build dependency.
- conda install --quiet jinja2 conda-build anaconda-client cython twine pytest
- conda install --quiet jinja2 conda-build=3.18.9 anaconda-client cython twine pytest

# make a wheel building environment to ensure correct python version.
- conda create --quiet -n wheel-build python=$CONDA_PY wheel cython
Expand Down Expand Up @@ -67,7 +69,7 @@ script:
# paying attention to CONDA_PY. See:
# https://github.com/conda/conda-build/issues/1832
# - export WHEEL_PACKAGE="$OUTPUT_DIR/*.whl"
- source activate wheel-build; python setup.py bdist_wheel; source deactivate
- conda activate wheel-build; python setup.py bdist_wheel; conda deactivate
- export WHEEL_PACKAGE=dist/*.whl
- echo $CONDA_PACKAGE
- echo $WHEEL_PACKAGE
Expand Down
1 change: 1 addition & 0 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ We are certain the list is incomplete; please let one of us know by opening an [
+ @qazwsxedcrfvtg14
+ @russkel
+ Kyle Dunn (@kdunn926)
+ Brian Su (@brianbbsu)

## Full timeline of vpython development

Expand Down
2 changes: 1 addition & 1 deletion vpython/vpython.py
Original file line number Diff line number Diff line change
Expand Up @@ -2131,7 +2131,7 @@ def interval(self,val):
def __del__(self):
cmd = {"cmd": "delete", "idx": self.idx}
self.appendcmd(cmd)
super(gcurve, self).__del__()
super(gobj, self).__del__()

def resolveargs(self, *vars):
ret = []
Expand Down