Skip to content

Commit a595e39

Browse files
committed
Merge branch 'master' of github.com:mongodb/mongo-python-driver
2 parents 5321aa8 + bdaf43c commit a595e39

File tree

3 files changed

+4
-10
lines changed

3 files changed

+4
-10
lines changed

doc/examples/authentication.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ Unix
139139
~~~~
140140

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

145145

doc/installation.rst

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Installing / Upgrading
66
<http://pypi.python.org/pypi/pymongo/>`_.
77

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

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

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

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

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

160157
# Alternative workaround using CFLAGS
161-
# easy_install
162-
$ CFLAGS=-Qunused-arguments easy_install pymongo
163-
# or pip
164158
$ CFLAGS=-Qunused-arguments pip install pymongo
165159

166160

requirements/typing.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
mypy==1.13.0
2-
pyright==1.1.390
2+
pyright==1.1.391
33
typing_extensions
44
-r ./encryption.txt
55
-r ./ocsp.txt

0 commit comments

Comments
 (0)