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

Python 3.6 Support #204

Merged
merged 27 commits into from
Mar 13, 2019
Merged

Python 3.6 Support #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
da615e8
added more python versions to test
Feb 21, 2019
4f553aa
removed mbuild dep
Feb 21, 2019
481094b
added mbuild in for testing + now we can see what happens when we try…
Feb 21, 2019
2253842
i expect this to fail, but we will see what deps we need
Feb 21, 2019
abfd5ff
forgot to activate env
Feb 21, 2019
97c1ae0
adding missing oset dep
Feb 21, 2019
5d0471d
now to get appveyor happy
Feb 21, 2019
db45e9c
lets do it more like we do it on travis
Feb 21, 2019
f93f0fa
now its just like travis
Feb 21, 2019
16a64dd
ya cmd
Feb 21, 2019
64aaf32
never forget a -y again!!!
Feb 21, 2019
ec76ea8
Merge branch 'feat/add_more_python_versions' into fix/remove_mbuild_dep
Feb 21, 2019
4867ecb
Update appveyor.yml
Feb 22, 2019
cba9a94
Update .travis.yml
Feb 22, 2019
2dedaa2
not sure how pytest can be installed, but not seen by python
Feb 22, 2019
9d3a8df
removed a trailing new line to get another ci build
Feb 22, 2019
fd460de
merged in some changes and updated to use -dev requirements.txt
Feb 22, 2019
98a920c
giving up on python3.7
Feb 22, 2019
b49e41f
lets see if I can get the build matrix for appveyor working
Feb 22, 2019
2ba63bb
Update .travis.yml
Mar 1, 2019
b6095f7
Update .travis.yml
Mar 1, 2019
b7e3078
Merge remote-tracking branch 'upstream/master' into fix/remove_mbuild…
Mar 11, 2019
647a158
add noarch to conda recipe
Mar 11, 2019
37240a0
test installing mbuild with just conda
Mar 11, 2019
4c4d298
remove noarch
Mar 11, 2019
a3cef18
removed some changes to appveyor that are not *needed* right now
Mar 11, 2019
7ce947d
properly reverted
Mar 11, 2019
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
2 changes: 2 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@ matrix:
include:
- { os: linux, env: PYTHON_VERSION=2.7 }
- { os: linux, env: PYTHON_VERSION=3.5 }
- { os: linux, env: PYTHON_VERSION=3.6 }
- { os: osx, env: PYTHON_VERSION=2.7 }
- { os: osx, env: PYTHON_VERSION=3.5 }
- { os: osx, env: PYTHON_VERSION=3.6 }

env:
global:
Expand Down
6 changes: 6 additions & 0 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,15 @@ environment:
PYTHONUNBUFFERED: 1

matrix:
- PYTHON: "C:\\Miniconda36-x64"
CONDA_PY: "27"
ARCH: "64"
- PYTHON: "C:\\Miniconda36-x64"
CONDA_PY: "35"
ARCH: "64"
- PYTHON: "C:\\Miniconda36-x64"
CONDA_PY: "36"
ARCH: "64"

install:
- set PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%
Expand Down