-
Notifications
You must be signed in to change notification settings - Fork 517
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.
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
Removing testing and support for Python 2.6 #322
Changes from 11 commits
b6f0097
99cc9e5
404e316
a3fb501
2589188
fbc9ee1
f256f25
490aaf1
9d6f6c0
818cfa3
9116621
5d883a2
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,11 +12,7 @@ | |
import sys | ||
import os | ||
import subprocess | ||
try: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Do we know that this was only for python 2.6? (i.e., is the comment correct?) There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think so. |
||
from subprocess import check_output as _run_cmd | ||
except: | ||
# python 2.6 | ||
from subprocess import check_call as _run_cmd | ||
from subprocess import check_output as _run_cmd | ||
import driver | ||
|
||
config = sys.argv[1] | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,58 @@ | ||
Getting Started | ||
=============== | ||
|
||
Installation, pyomo command, a simple example, etc | ||
Installation | ||
------------ | ||
|
||
.. doctest:: | ||
Pyomo currently supports the following versions of Python: | ||
|
||
* CPython: 2.7, 3.5, 3.6 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We still support 3.4 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Added. |
||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @whart222 you're missing 3.4 in this list There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done. |
||
|
||
Using CONDA | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. "Conda" not "CONDA" |
||
~~~~~~~~~~~ | ||
|
||
We recommend installation with *conda*, which is included with the Anaconda | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I do not recommend conda. I am still confused as to why we don't list pip as the standard install route for pyomo and list conda as a convenience for Anaconda users. Recommending miniconda for non-conda platforms results in a new Python on their system, which will cause problems with IDEs, PATHs, etc. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I do recommend conda, because pyomo.extras robustly installs third-party packages. We tried using a similar package for PyPI and users had problem with package installations. You don't need to install miniconda to use conda. |
||
distribution of Python. If you have a different Python distribution, then | ||
you can install *miniconda* using *pip*: | ||
|
||
.. bash:: | ||
pip install miniconda | ||
|
||
You can install Pyomo in your system Python installation | ||
by executing the following in a shell: | ||
|
||
.. bash:: | ||
conda install -c conda-forge pyomo | ||
|
||
Pyomo also has conditional dependencies on a variety of third-party Python packages. These can also be installed with conda: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This document should list the third-party packages, as that is relevant to all distributions /package managers (i.e., pip) There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Perhaps it should. But I'm pretty sure that no one will maintain this list here. |
||
|
||
.. bash:: | ||
conda install -c conda-forge pyomo.extras | ||
|
||
Optimization solvers are not installed with Pyomo, but some open source optimization solvers can be installed with conda as well: | ||
|
||
.. bash:: | ||
conda install -c conda-forge pyomo.solvers | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This should be There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done. |
||
|
||
|
||
Using PIP | ||
~~~~~~~~~ | ||
|
||
The standard utility for installing Python packages is *pip*. You | ||
can install Pyomo in your system Python installation by executing | ||
the following in a shell: | ||
|
||
.. bash:: | ||
pip install pyomo | ||
|
||
However, *pip* does not support the robust installation of conditional | ||
dependencies (i.e. the third-party Python packages or the solvers | ||
that Pyomo may use). | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I disagree with this statement. pip is the generally recommended installation method for Python packages. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is a true statement, regardless whether pip is generally recommended. But I'll delete it. |
||
|
||
|
||
A Simple Example | ||
---------------- | ||
|
||
TODO pyomo command, importing pyomo, using NEOS, etc | ||
|
||
>>> print('Hello World') | ||
Hello World |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change s a bleed over from #438. At a minimum, we need to resync with master.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I already synced with master. This documentation was omitted in that PR. I figured it was a waste of time to have a PR for 7 characters.