Skip to content

Commit 188608e

Browse files
Tweak documentation and README files.
1 parent 0ff1003 commit 188608e

File tree

3 files changed

+46
-32
lines changed

3 files changed

+46
-32
lines changed

doc/src/user_guide/installation.rst

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ To use cx_Oracle 8 with Python and Oracle Database you need:
1717
<https://www.oracle.com/database/technologies/instant-client.html>`__,
1818
or those included in Oracle Database if Python is on the same
1919
machine as the database. Oracle client libraries versions 19, 18, 12,
20-
and 11.2 are supported on Linux, Windows and macOS. Users have
20+
and 11.2 are supported on Linux, Windows and macOS (Intel x86). Users have
2121
also reported success with other platforms. Use the latest client possible:
2222
Oracle's standard client-server version interoperability allows connection to
2323
both older and newer databases.
@@ -571,8 +571,8 @@ Python architecture.
571571
Alternatively, pass ``config_dir`` to :meth:`~cx_Oracle.init_oracle_client()`
572572
as shown in the previous section, or set ``TNS_ADMIN`` to the directory name.
573573

574-
Installing cx_Oracle on macOS
575-
=============================
574+
Installing cx_Oracle on macOS (Intel x86)
575+
=========================================
576576

577577
Install Python
578578
--------------
@@ -582,6 +582,8 @@ entitlements and will fail to load Oracle client libraries. Instead use
582582
`Homebrew <https://brew.sh>`__ or `Python.org
583583
<https://www.python.org/downloads>`__.
584584

585+
A C compiler is needed, for example Xcode and its command line tools.
586+
585587
Install cx_Oracle
586588
-----------------
587589

@@ -591,6 +593,7 @@ package to install cx_Oracle from `PyPI
591593

592594
.. code-block:: shell
593595
596+
export ARCHFLAGS="-arch x86_64"
594597
python -m pip install cx_Oracle --upgrade
595598
596599
The ``--user`` option may be useful, if you don't have permission to write to

samples/README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
This directory contains samples for cx_Oracle.
1+
# cx_Oracle Examples
2+
3+
This directory contains samples for [cx_Oracle][6]. Documentation is [here][7].
24

35
1. The schemas and SQL objects that are referenced in the samples can be
46
created by running the Python script [SetupSamples.py][1]. The script
@@ -39,3 +41,5 @@ This directory contains samples for cx_Oracle.
3941
[3]: https://github.com/oracle/python-cx_Oracle/blob/master/samples/sql/SetupSamples.sql
4042
[4]: https://github.com/oracle/python-cx_Oracle/blob/master/samples/DropSamples.py
4143
[5]: https://github.com/oracle/python-cx_Oracle/blob/master/samples/sql/DropSamples.sql
44+
[6]: https://oracle.github.io/python-cx_Oracle/
45+
[7]: http://cx-oracle.readthedocs.org/en/latest/index.html

test/README.md

Lines changed: 35 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,53 @@
11
This directory contains the test suite for cx_Oracle.
22

3-
1. The schemas and SQL objects that are referenced in the test suite can be
4-
created by running the Python script [SetupTest.py][1]. The script requires
5-
administrative privileges and will prompt for these credentials as well as
6-
the names of the schemas that will be created, unless a number of
7-
environment variables are set as documented in the Python script
8-
[TestEnv.py][2]. Run the script using the following command:
3+
1. The schemas and SQL objects that are referenced in the test suite can be
4+
created by running the Python script [SetupTest.py][1]. The script requires
5+
administrative privileges and will prompt for these credentials as well as
6+
the names of the schemas that will be created, unless a number of
7+
environment variables are set, as documented in the Python script
8+
[test_env.py][2]. Run the script using the following command:
99

10-
python SetupTest.py
10+
python SetupTest.py
1111

12-
Alternatively, the [SQL script][3] can be run directly via SQL\*Plus, which
13-
will always prompt for the names of the schemas that will be created. Run
14-
the script using the following command:
12+
Alternatively, the [SQL script][3] can be run directly via SQL\*Plus, which
13+
will always prompt for the names of the schemas that will be created. Run
14+
the script using the following command:
1515

16-
sqlplus system/systempassword@hostname/servicename @sql/SetupTest.sql
16+
sqlplus system/systempassword@hostname/servicename @sql/SetupTest.sql
1717

18-
2. Run the test suite by issuing the following command in the top-level
19-
directory of your cx_Oracle installation:
18+
2. Run the test suite by issuing the following command in the top-level
19+
directory of your cx_Oracle installation:
2020

21-
tox
21+
tox
2222

23-
Alternatively, you can run the test suite directly within this directory:
23+
This will build the module in an independent environment and run the test
24+
suite using the module that was just built in that environment.
25+
Alternatively, you can use the currently installed build of cx_Oracle and
26+
run the following command instead:
2427

25-
python TestEnv.py
28+
python -m unittest discover -v -s test
2629

27-
3. After running the test suite, the schemas can be dropped by running the
28-
Python script [DropTest.py][4]. The script requires administrative
29-
privileges and will prompt for these credentials as well as the names of the
30-
schemas that will be dropped, unless a number of environment variables are
31-
set as documented in the Python script [TestEnv.py][2]. Run the script using
32-
the following command:
30+
You may also run each of the test scripts independently, as in:
3331

34-
python DropTest.py
32+
python test_1000_module.py
3533

36-
Alternatively, the [SQL script][5] can be run directly via SQL\*Plus, which
37-
will always prompt for the names of the schemas that will be dropped. Run
38-
the script using the following command:
34+
3. After running the test suite, the schemas can be dropped by running the
35+
Python script [DropTest.py][4]. The script requires administrative
36+
privileges and will prompt for these credentials as well as the names of
37+
the schemas that will be dropped, unless a number of environment variables
38+
are set, as documented in the Python script [test_env.py][2]. Run the
39+
script using the following command:
3940

40-
sqlplus system/systempassword@hostname/servicename @sql/DropTest.sql
41+
python DropTest.py
42+
43+
Alternatively, the [SQL script][5] can be run directly via SQL\*Plus, which
44+
will always prompt for the names of the schemas that will be dropped. Run
45+
the script using the following command:
46+
47+
sqlplus system/systempassword@hostname/servicename @sql/DropTest.sql
4148

4249
[1]: https://github.com/oracle/python-cx_Oracle/blob/master/test/SetupTest.py
43-
[2]: https://github.com/oracle/python-cx_Oracle/blob/master/test/TestEnv.py
50+
[2]: https://github.com/oracle/python-cx_Oracle/blob/master/test/test_env.py
4451
[3]: https://github.com/oracle/python-cx_Oracle/blob/master/test/sql/SetupTest.sql
4552
[4]: https://github.com/oracle/python-cx_Oracle/blob/master/test/DropTest.py
4653
[5]: https://github.com/oracle/python-cx_Oracle/blob/master/test/sql/DropTest.sql

0 commit comments

Comments
 (0)