Skip to content

Commit 06bb235

Browse files
authored
Merge pull request #34 from brianbbsu/master
Calling correct delete function on deletion of gobj
2 parents f6f9d64 + 4c2e3bd commit 06bb235

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

.travis.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,27 @@ env:
1515
- TWINE_USERNAME="mwcraig"
1616
matrix:
1717
- CONDA_PY=3.6
18-
- CONDA_PY=3.7
18+
- CONDA_PY=3.7.3 # 3.7.4 on conda is broken
1919

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

2830
# Gets us vpnotebook
2931
- conda config --add channels vpython
3032
- conda config --append channels conda-forge
3133

32-
- conda update --quiet conda
34+
- conda install conda python=$CONDA_PY
3335

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

3840
# make a wheel building environment to ensure correct python version.
3941
- conda create --quiet -n wheel-build python=$CONDA_PY wheel cython
@@ -67,7 +69,7 @@ script:
6769
# paying attention to CONDA_PY. See:
6870
# https://github.com/conda/conda-build/issues/1832
6971
# - export WHEEL_PACKAGE="$OUTPUT_DIR/*.whl"
70-
- source activate wheel-build; python setup.py bdist_wheel; source deactivate
72+
- conda activate wheel-build; python setup.py bdist_wheel; conda deactivate
7173
- export WHEEL_PACKAGE=dist/*.whl
7274
- echo $CONDA_PACKAGE
7375
- echo $WHEEL_PACKAGE

CONTRIBUTORS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ We are certain the list is incomplete; please let one of us know by opening an [
2828
+ @qazwsxedcrfvtg14
2929
+ @russkel
3030
+ Kyle Dunn (@kdunn926)
31+
+ Brian Su (@brianbbsu)
3132

3233
## Full timeline of vpython development
3334

vpython/vpython.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2131,7 +2131,7 @@ def interval(self,val):
21312131
def __del__(self):
21322132
cmd = {"cmd": "delete", "idx": self.idx}
21332133
self.appendcmd(cmd)
2134-
super(gcurve, self).__del__()
2134+
super(gobj, self).__del__()
21352135

21362136
def resolveargs(self, *vars):
21372137
ret = []

0 commit comments

Comments
 (0)