Skip to content

Commit 294bb51

Browse files
committed
chore!: remove "apiclient" package
"apiclient" was created in 2014 as a stop-gap to help people transition from "apiclient" to "googleapiclient". This transition should have been completed in the past 10 years. However now this is creating package pollution that interferes with another PyPI package called "api-client" that also writes to ".../site-packages/apiclient/" and conflicts with this package. BREAKING CHANGE: removes "apiclient" package which may still break those who haven't transitioned.
1 parent 74d230f commit 294bb51

File tree

9 files changed

+9
-38
lines changed

9 files changed

+9
-38
lines changed

MANIFEST.in

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
recursive-include apiclient *.json *.py
21
recursive-include googleapiclient *.json *.py
32
include CHANGELOG
43
include LICENSE

apiclient/__init__.py

-27
This file was deleted.

docs/build

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# Author: [email protected] (Joe Gregorio)
1818
#
1919
# Creates the documentation set for the library by
20-
# running pydoc on all the files in apiclient.
20+
# running pydoc on all the files in googleapiclient.
2121
#
2222
# Notes: You may have to update the location of the
2323
# App Engine library for your local system.

docs/media.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ If a request fails, an [`googleapiclient.errors.HttpError`](https://googleapis.g
6060
The following is a good exception handling pattern for resumable media uploads:
6161

6262
```py
63-
except apiclient.errors.HttpError, e:
63+
except googleapiclient.errors.HttpError, e:
6464
if e.resp.status in [404]:
6565
# Start the upload all over again.
6666
elif e.resp.status in [500, 502, 503, 504]:

googleapiclient/discovery.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -1506,9 +1506,9 @@ def new_batch_http_request(callback=None):
15061506
callback: callable, A callback to be called for each response, of the
15071507
form callback(id, response, exception). The first parameter is the
15081508
request id, and the second is the deserialized response object. The
1509-
third is an apiclient.errors.HttpError exception object if an HTTP
1510-
error occurred while processing the request, or None if no error
1511-
occurred.
1509+
third is a googleapiclient.errors.HttpError exception object if an
1510+
HTTP error occurred while processing the request, or None if no
1511+
error occurred.
15121512
15131513
Returns:
15141514
A BatchHttpRequest object based on the discovery document.

noxfile.py

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
BLACK_VERSION = "black==22.3.0"
2121
ISORT_VERSION = "isort==5.10.1"
2222
BLACK_PATHS = [
23-
"apiclient",
2423
"googleapiclient",
2524
"scripts",
2625
"tests",

samples/prediction/prediction.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
import sys
4545
import time
4646

47-
from apiclient import sample_tools
47+
from googleapiclient import sample_tools
4848
from oauth2client import client
4949

5050

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
from setuptools import setup
3232

33-
packages = ["apiclient", "googleapiclient", "googleapiclient/discovery_cache"]
33+
packages = ["googleapiclient", "googleapiclient/discovery_cache"]
3434

3535
install_requires = [
3636
"httplib2>=0.19.0,<1.dev0",

tools/gae-zip-creator.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ENV_PATH=${ROOT_PATH}/ve
1717
LOG_PATH=${ROOT_PATH}/gae_zip_build.log
1818

1919
# The api client version
20-
APICLIENT_VERSION=$(python -c "import apiclient; print apiclient.__version__")
20+
APICLIENT_VERSION=$(python -c "import googleapiclient; print googleapiclient.__version__")
2121

2222
# Where to create the zip.
2323
DIST_PATH=$(pwd)/dist/gae
@@ -57,7 +57,7 @@ echo "Built zip in ${ZIP_PATH}"
5757
# Sanity test the zip.
5858
# TODO (afshar): Run the complete test suite.
5959
echo "Sanity testing the zip:"
60-
export SANITY_MODS="httplib2 apiclient uritemplate oauth2client"
60+
export SANITY_MODS="httplib2 googleapiclient uritemplate oauth2client"
6161
export SANITY_ZIP=${ZIP_PATH}
6262
export PYTHONPATH=${ZIP_PATH}
6363
${ENV_PATH}/bin/python -c "import sys, os

0 commit comments

Comments
 (0)