Skip to content

Commit

Permalink
Documentation tweaks.
Browse files Browse the repository at this point in the history
  • Loading branch information
anthony-tuininga committed Aug 11, 2017
1 parent 49bc108 commit c761d13
Showing 1 changed file with 13 additions and 2 deletions.
15 changes: 13 additions & 2 deletions doc/src/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ If you are upgrading from cx_Oracle 5 note these installation changes:
You must set ``LD_LIBRARY_PATH`` or use ``ldconfig`` to locate the Oracle
client library.

- PyPI no longer allows Windows installers or Linux RPMs to be
hosted. Use the supplied cx_Oracle Wheels instead.

Install Using Pip
=================
Expand Down Expand Up @@ -111,11 +113,20 @@ index.html>`__. Only the "Basic" or "Basic Light" package is required. Oracle
Client libraries are also available in any Oracle Database installation or
full Oracle Client installation.

Make sure your library loading path, such as ``PATH`` on Windows, or
``LD_LIBRARY_PATH`` on Linux, is set to the location of the Oracle
Client libraries. On macOS the libraries should be in ``~/lib`` or
``/usr/local/lib``.

On Windows, `Microsoft Windows Redistributables
<https://oracle.github.io/odpi/doc/installation.html#windows>`__
matching the version of the Oracle client libraries need to be
installed.

See `ODPI-C installation instructions
<https://oracle.github.io/odpi/doc/installation.html>`__ for details
on configuration.

Oracle Database
===============

Expand Down Expand Up @@ -186,8 +197,8 @@ If importing cx_Oracle fails:
have restarted your command prompt if you have modified environment
variables.
- Check the ``LD_LIBRARY_PATH`` environment variable on Linux.
- On macOS, make sure Oracle Instant Client is in `~/lib` or
`/usr/local/lib` and that you are not using the bundled Python (use
- On macOS, make sure Oracle Instant Client is in ``~/lib`` or
``/usr/local/lib`` and that you are not using the bundled Python (use
`Homebrew <https://brew.sh>`__ or `Python.org
<https://www.python.org/downloads>`__ instead).
- Check that Python, cx_Oracle and your Oracle Client libraries are all
Expand Down

0 comments on commit c761d13

Please sign in to comment.