Skip to content

Commit

Permalink
Merge pull request #438 from Pyomo/issue_432
Browse files Browse the repository at this point in the history
Resolve Python 3.4 Build Issues on Appveyor
  • Loading branch information
whart222 authored Apr 24, 2018
2 parents 11e6068 + 80b5299 commit fd2bd02
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
4 changes: 3 additions & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,10 @@ install:
#
# Update conda, then force it to NOT update itself again
#
# Somehow, the update from anaconda stalls for Python 3.4. So we're not specifying the channel here.
#
- conda config --set always_yes yes
- conda update -q -y -c anaconda conda
- conda update -q -y conda
- conda config --set auto_update_conda false
#
- "%CONDAFORGE% setuptools pip"
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Pyomo CHANGELOG
Current Development
-------------------------------------------------------------------------------

- Resolved Python 3.4 build errors on Appveyor.
- Wrap Vars in value() for assignment to numpy vectors (#436)
- Adding TerminationCondition and SolverStatus to pyomo.environ (#429)

Expand Down

0 comments on commit fd2bd02

Please sign in to comment.