Skip to content

Commit

Permalink
Merge branch 'master' of github.com:mongodb/mongo-python-driver
Browse files Browse the repository at this point in the history
  • Loading branch information
blink1073 committed Dec 31, 2024
2 parents 5321aa8 + bdaf43c commit a595e39
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 10 deletions.
2 changes: 1 addition & 1 deletion doc/examples/authentication.rst
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ Unix
~~~~

To authenticate using GSSAPI you must first install the python `kerberos`_ or
`pykerberos`_ module using easy_install or pip. Make sure you run kinit before
`pykerberos`_ module using pip. Make sure you run kinit before
using the following authentication methods::

$ kinit [email protected]
Expand Down
10 changes: 2 additions & 8 deletions doc/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Installing / Upgrading
<http://pypi.python.org/pypi/pymongo/>`_.

.. warning:: **Do not install the "bson" package from pypi.** PyMongo comes
with its own bson package; doing "pip install bson" or "easy_install bson"
with its own bson package; doing "pip install bson"
installs a third-party package that is incompatible with PyMongo.

Installing with pip
Expand Down Expand Up @@ -134,7 +134,7 @@ Python to fail to build the C extensions if you have Xcode 4 installed. There
is a workaround::

# For some Python builds from python.org
$ env ARCHFLAGS='-arch i386 -arch x86_64' python -m easy_install pymongo
$ env ARCHFLAGS='-arch i386 -arch x86_64' python -m pip install pymongo

See `http://bugs.python.org/issue11623 <http://bugs.python.org/issue11623>`_
for a more detailed explanation.
Expand All @@ -152,15 +152,9 @@ This may cause C extension builds to fail with an error similar to::
There are workarounds::

# Apple specified workaround for Xcode 5.1
# easy_install
$ ARCHFLAGS=-Wno-error=unused-command-line-argument-hard-error-in-future easy_install pymongo
# or pip
$ ARCHFLAGS=-Wno-error=unused-command-line-argument-hard-error-in-future pip install pymongo

# Alternative workaround using CFLAGS
# easy_install
$ CFLAGS=-Qunused-arguments easy_install pymongo
# or pip
$ CFLAGS=-Qunused-arguments pip install pymongo


Expand Down
2 changes: 1 addition & 1 deletion requirements/typing.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
mypy==1.13.0
pyright==1.1.390
pyright==1.1.391
typing_extensions
-r ./encryption.txt
-r ./ocsp.txt
Expand Down

0 comments on commit a595e39

Please sign in to comment.