Skip to content

Commit

Permalink
DOC: update redirects
Browse files Browse the repository at this point in the history
  • Loading branch information
jeffgortmaker committed Oct 3, 2019
1 parent ce2d689 commit 9159db3
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ If you use pyblp in your research, we ask that you also cite `Conlon and Gortmak
Installation
------------

The pyblp package has been tested on `Python <https://www.python.org/downloads/>`_ versions 3.6 and 3.7. The `SciPy instructions <https://scipy.org/install.html>`_ for installing related packages is a good guide for how to install a scientific Python environment. A good choice is the `Anaconda Distribution <https://www.anaconda.com/distribution/>`_, since, along with many other packages that are useful for scientific computing, it comes packaged with pyblp's only required dependencies: `NumPy <https://www.numpy.org/>`_, `SciPy <https://www.scipy.org/>`_, `SymPy <https://www.sympy.org/en/index.html>`_, and `Patsy <https://patsy.readthedocs.io/en/latest/>`_.
The pyblp package has been tested on `Python <https://www.python.org/downloads/>`_ versions 3.6 and 3.7. The `SciPy instructions <https://scipy.org/install.html>`_ for installing related packages is a good guide for how to install a scientific Python environment. A good choice is the `Anaconda Distribution <https://www.anaconda.com/distribution/>`_, since, along with many other packages that are useful for scientific computing, it comes packaged with pyblp's only required dependencies: `NumPy <https://numpy.org/>`_, `SciPy <https://www.scipy.org/>`_, `SymPy <https://www.sympy.org/en/index.html>`_, and `Patsy <https://patsy.readthedocs.io/en/latest/>`_.

However, pyblp may not work with old versions of its dependencies. You can update pyblp's dependencies in Anaconda with::

Expand Down
2 changes: 1 addition & 1 deletion docs/notebooks/api/data.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"Any number of functions can be used to load the example data into memory. In this example, we'll first use [NumPy](https://www.numpy.org/)."
"Any number of functions can be used to load the example data into memory. In this example, we'll first use [NumPy](https://numpy.org/)."
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion docs/notebooks/tutorial/logit_nested.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
"source": [
"### Loading the Data\n",
"\n",
"The `product_data` argument of :class:`Problem` should be a structured array-like object with fields that store data. Product data can be a structured [NumPy](https://www.numpy.org/) array, a [pandas](https://pandas.pydata.org/) DataFrame, or other similar objects."
"The `product_data` argument of :class:`Problem` should be a structured array-like object with fields that store data. Product data can be a structured [NumPy](https://numpy.org/) array, a [pandas](https://pandas.pydata.org/) DataFrame, or other similar objects."
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion docs/notebooks/tutorial/nevo.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
"source": [
"### Loading the Data\n",
"\n",
"The `product_data` argument of :class:`Problem` should be a structured array-like object with fields that store data. Product data can be a structured [NumPy](https://www.numpy.org/) array, a [pandas](https://pandas.pydata.org/) DataFrame, or other similar objects."
"The `product_data` argument of :class:`Problem` should be a structured array-like object with fields that store data. Product data can be a structured [NumPy](https://numpy.org/) array, a [pandas](https://pandas.pydata.org/) DataFrame, or other similar objects."
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion docs/testing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ In addition to the installation requirements for the package itself, running tes

The full suite of tests also requires installation of the following software:

- `Artleys Knitro <https://www.artelys.com/en/optimization-tools/knitro>`_ version 10.3 or newer: testing optimization routines.
- `Artleys Knitro <https://www.artelys.com/solvers/knitro/>`_ version 10.3 or newer: testing optimization routines.
- `MATLAB <https://www.mathworks.com/products/matlab.html>`_: comparing sparse grids with those created by the function `nwspgr <http://www.sparse-grids.de/>`_ created by Florian Heiss and Viktor Winschel, which must be included in a directory on the MATLAB path.

If software is not installed, its associated tests will be skipped. Additionally, some tests that require support for extended precision will be skipped if on the platform running the tests, ``numpy.longdouble`` has the same precision as ``numpy.float64``. This tends to be the case on Windows.
Expand Down
12 changes: 6 additions & 6 deletions pyblp/configurations/optimization.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ class Optimization(StringRepresentation):
gradients:
- ``'knitro'`` - Uses an installed version of
`Artleys Knitro <https://www.artelys.com/en/optimization-tools/knitro>`_. Python 3 is supported by Knitro
version 10.3 and newer. A number of environment variables most likely need to be configured properly, such
as ``KNITRODIR``, ``ARTELYS_LICENSE``, ``LD_LIBRARY_PATH`` (on Linux), and ``DYLD_LIBRARY_PATH`` (on Mac
OS X). For more information, refer to the
`Knitro installation guide <https://www.artelys.com/tools/knitro_doc/1_introduction/installation.html>`_.
`Artleys Knitro <https://www.artelys.com/solvers/knitro/>`_. Python 3 is supported by Knitro version 10.3
and newer. A number of environment variables most likely need to be configured properly, such as
``KNITRODIR``, ``ARTELYS_LICENSE``, ``LD_LIBRARY_PATH`` (on Linux), and ``DYLD_LIBRARY_PATH`` (on
Mac OS X). For more information, refer to the
`Knitro installation guide <https://www.artelys.com/docs/knitro//1_introduction/installation.html>`_.
- ``'slsqp'`` - Uses the :func:`scipy.optimize.minimize` SLSQP routine.
Expand Down Expand Up @@ -88,7 +88,7 @@ class Optimization(StringRepresentation):
options are available for each optimization routine.
If ``method`` is ``'knitro'``, these options should be
`Knitro user options <https://www.artelys.com/tools/knitro_doc/3_referenceManual/userOptions.html>`_. The
`Knitro user options <https://www.artelys.com/docs/knitro//3_referenceManual/userOptions.html>`_. The
non-standard ``knitro_dir`` option can also be specified. The following options have non-standard default
values:
Expand Down

0 comments on commit 9159db3

Please sign in to comment.