From b161336eb2aaadd152f8e648f4bfbf2ec88dec88 Mon Sep 17 00:00:00 2001 From: Justin Date: Thu, 12 Oct 2017 11:57:15 -0500 Subject: [PATCH 01/13] Fix Ruby 2.3 homebrew issue There is currently an issue where homebrew will always fail due to an issue with ruby. Forcing homebrew to update before installing any packages fixes this issue. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 272af1c59..1f8759db1 100755 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,7 @@ env: - COMMIT_AUTHOR_EMAIL: "janos.sallai@vanderbilt.edu" install: + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install md5sha1sum; fi - source devtools/travis-ci/install.sh - conda config --set always_yes yes --set changeps1 no From 93d3d64dc20c8ad7d3b35b5bb6dead665a11a2fc Mon Sep 17 00:00:00 2001 From: Justin Date: Fri, 20 Oct 2017 14:28:15 -0500 Subject: [PATCH 02/13] shell_session_update issue rvm apparently has some issues that use missing osx functions checking out a later version should fix --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 1f8759db1..113d9c448 100755 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,7 @@ env: install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then rvm get head; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install md5sha1sum; fi - source devtools/travis-ci/install.sh - conda config --set always_yes yes --set changeps1 no From b03199387c5965ff8cfc26df8f03a63adad947fc Mon Sep 17 00:00:00 2001 From: Justin Date: Fri, 27 Oct 2017 15:02:41 -0500 Subject: [PATCH 03/13] Enforce loading of pytest module --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 113d9c448..19f249e7b 100755 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,7 @@ install: - pip install -e . script: - - py.test -v --cov=mbuild --cov-report= --pyargs mbuild + - python -m pytest -v --cov=mbuild --cov-report= --pyargs mbuild after_success: - coveralls From 6ed203c0f141fe02dc58e254cf8dd89209048885 Mon Sep 17 00:00:00 2001 From: Justin Date: Fri, 27 Oct 2017 17:05:38 -0500 Subject: [PATCH 04/13] Trying another possible fix --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 19f249e7b..5aa234fee 100755 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ install: - conda config --add channels mosdef - conda create -n test-environment python=$PYTHON_VERSION --file requirements.txt - source activate test-environment - - pip install -e . + - python setup.py install script: - python -m pytest -v --cov=mbuild --cov-report= --pyargs mbuild From 5d94f271c670de6a45d244a4c64ec865fa3bf929 Mon Sep 17 00:00:00 2001 From: Justin Date: Wed, 1 Nov 2017 12:17:01 -0500 Subject: [PATCH 05/13] Possible python 3.5 work around: https://github.com/travis-ci/travis-ci/issues/8363 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 5aa234fee..903d235d3 100755 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,7 @@ env: - COMMIT_AUTHOR_EMAIL: "janos.sallai@vanderbilt.edu" install: + - pyenv global system $PYTHON_VERSION - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then rvm get head; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install md5sha1sum; fi From 5b8ef6e45877aa233b0f8043f87f1207ccc9c1e0 Mon Sep 17 00:00:00 2001 From: Justin Date: Tue, 7 Nov 2017 15:48:11 -0600 Subject: [PATCH 06/13] Revert "shell_session_update issue" This reverts commit 93d3d64dc20c8ad7d3b35b5bb6dead665a11a2fc. --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 903d235d3..9776ad397 100755 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,6 @@ env: install: - pyenv global system $PYTHON_VERSION - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then rvm get head; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install md5sha1sum; fi - source devtools/travis-ci/install.sh - conda config --set always_yes yes --set changeps1 no From 47fd3dff39f2f41c42e581ff135c0bad07e665aa Mon Sep 17 00:00:00 2001 From: Justin Date: Tue, 7 Nov 2017 16:00:36 -0600 Subject: [PATCH 07/13] Pycosat recently updated and causing dep issues --- requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 0b3438b00..1e8792c3a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,5 @@ numpy +pycosat=0.6.2 scipy packmol=1.0.0 nglview>=0.6.2.3 @@ -14,4 +15,4 @@ nbformat ipykernel ipyext python-coveralls -pytest-cov \ No newline at end of file +pytest-cov From 1a996e2d133d7ec5df1ab836015a011397aba740 Mon Sep 17 00:00:00 2001 From: Justin Date: Tue, 7 Nov 2017 16:15:05 -0600 Subject: [PATCH 08/13] Appveyor fix --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 9aa75b5f7..7a17c1f9e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,7 +3,7 @@ environment: PYTHONUNBUFFERED: 1 matrix: - - PYTHON: "C:\\Miniconda3-x64" + - PYTHON: "C:\\Miniconda36-x64" CONDA_PY: "35" ARCH: "64" From f823ef8a22d8ae565b88cc68d80904f0f146cfcf Mon Sep 17 00:00:00 2001 From: Justin Date: Tue, 7 Nov 2017 16:24:51 -0600 Subject: [PATCH 09/13] Undo pycosat dep requirement --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 1e8792c3a..1f480d6d4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,4 @@ numpy -pycosat=0.6.2 scipy packmol=1.0.0 nglview>=0.6.2.3 From 56e9eb6cd7bb52101bb0abf72555a94e1d3ef0e8 Mon Sep 17 00:00:00 2001 From: Justin Date: Tue, 7 Nov 2017 16:29:37 -0600 Subject: [PATCH 10/13] test if python-cov version causing macos issues --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 1f480d6d4..11ce11947 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,4 +14,4 @@ nbformat ipykernel ipyext python-coveralls -pytest-cov +pytest-cov=2.3.1 From ef60146734f63af2b4522f67e80d4c66b37247aa Mon Sep 17 00:00:00 2001 From: Justin Date: Tue, 7 Nov 2017 17:00:16 -0600 Subject: [PATCH 11/13] Coverage fix --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9776ad397..6221e2e73 100755 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ install: - conda config --add channels mosdef - conda create -n test-environment python=$PYTHON_VERSION --file requirements.txt - source activate test-environment - - python setup.py install + - pip install -e . script: - python -m pytest -v --cov=mbuild --cov-report= --pyargs mbuild From 1ad167330cdf3c7d639c49bc73a661a51000ab65 Mon Sep 17 00:00:00 2001 From: Justin Date: Tue, 7 Nov 2017 18:04:59 -0600 Subject: [PATCH 12/13] OSX error due to pyenv, should fix this --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6221e2e73..7d59d1bba 100755 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,6 @@ env: - COMMIT_AUTHOR_EMAIL: "janos.sallai@vanderbilt.edu" install: - - pyenv global system $PYTHON_VERSION - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install md5sha1sum; fi - source devtools/travis-ci/install.sh From 03bee561f728e5a1132f6f11424c89b67f05b628 Mon Sep 17 00:00:00 2001 From: Justin Date: Wed, 8 Nov 2017 11:05:21 -0600 Subject: [PATCH 13/13] Unnecessary change --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 11ce11947..1f480d6d4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,4 +14,4 @@ nbformat ipykernel ipyext python-coveralls -pytest-cov=2.3.1 +pytest-cov