From 7bba2591f8c42e4a5d41d6d5e168979650d54cdd Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Thu, 18 Aug 2016 14:28:30 -0700 Subject: [PATCH] Removing _testing mock modules. No longer needed since gRPC works (mostly?) everywhere. --- _testing/grpc/__init__.py | 13 ------------- _testing/grpc/_adapter/__init__.py | 13 ------------- _testing/grpc/_adapter/_c.py | 13 ------------- _testing/grpc/beta/__init__.py | 13 ------------- _testing/grpc/beta/implementations.py | 13 ------------- _testing/grpc/beta/interfaces.py | 13 ------------- _testing/grpc/early_adopter/__init__.py | 13 ------------- _testing/grpc/early_adopter/implementations.py | 13 ------------- _testing/grpc/framework/__init__.py | 13 ------------- _testing/grpc/framework/alpha/__init__.py | 13 ------------- _testing/grpc/framework/alpha/utilities.py | 13 ------------- _testing/grpc/framework/common/__init__.py | 13 ------------- _testing/grpc/framework/common/cardinality.py | 13 ------------- _testing/grpc/framework/interfaces/__init__.py | 13 ------------- _testing/grpc/framework/interfaces/face/__init__.py | 13 ------------- _testing/grpc/framework/interfaces/face/face.py | 13 ------------- .../grpc/framework/interfaces/face/utilities.py | 13 ------------- appveyor.yml | 4 ---- scripts/update_json_docs.sh | 2 +- tox.ini | 4 ---- 20 files changed, 1 insertion(+), 230 deletions(-) delete mode 100644 _testing/grpc/__init__.py delete mode 100644 _testing/grpc/_adapter/__init__.py delete mode 100644 _testing/grpc/_adapter/_c.py delete mode 100644 _testing/grpc/beta/__init__.py delete mode 100644 _testing/grpc/beta/implementations.py delete mode 100644 _testing/grpc/beta/interfaces.py delete mode 100644 _testing/grpc/early_adopter/__init__.py delete mode 100644 _testing/grpc/early_adopter/implementations.py delete mode 100644 _testing/grpc/framework/__init__.py delete mode 100644 _testing/grpc/framework/alpha/__init__.py delete mode 100644 _testing/grpc/framework/alpha/utilities.py delete mode 100644 _testing/grpc/framework/common/__init__.py delete mode 100644 _testing/grpc/framework/common/cardinality.py delete mode 100644 _testing/grpc/framework/interfaces/__init__.py delete mode 100644 _testing/grpc/framework/interfaces/face/__init__.py delete mode 100644 _testing/grpc/framework/interfaces/face/face.py delete mode 100644 _testing/grpc/framework/interfaces/face/utilities.py diff --git a/_testing/grpc/__init__.py b/_testing/grpc/__init__.py deleted file mode 100644 index 61e4b7953cea..000000000000 --- a/_testing/grpc/__init__.py +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2015 Google Inc. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. diff --git a/_testing/grpc/_adapter/__init__.py b/_testing/grpc/_adapter/__init__.py deleted file mode 100644 index 61e4b7953cea..000000000000 --- a/_testing/grpc/_adapter/__init__.py +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2015 Google Inc. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. diff --git a/_testing/grpc/_adapter/_c.py b/_testing/grpc/_adapter/_c.py deleted file mode 100644 index 61e4b7953cea..000000000000 --- a/_testing/grpc/_adapter/_c.py +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2015 Google Inc. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. diff --git a/_testing/grpc/beta/__init__.py b/_testing/grpc/beta/__init__.py deleted file mode 100644 index 61e4b7953cea..000000000000 --- a/_testing/grpc/beta/__init__.py +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2015 Google Inc. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. diff --git a/_testing/grpc/beta/implementations.py b/_testing/grpc/beta/implementations.py deleted file mode 100644 index 61e4b7953cea..000000000000 --- a/_testing/grpc/beta/implementations.py +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2015 Google Inc. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. diff --git a/_testing/grpc/beta/interfaces.py b/_testing/grpc/beta/interfaces.py deleted file mode 100644 index c098733431fd..000000000000 --- a/_testing/grpc/beta/interfaces.py +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2016 Google Inc. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. diff --git a/_testing/grpc/early_adopter/__init__.py b/_testing/grpc/early_adopter/__init__.py deleted file mode 100644 index 61e4b7953cea..000000000000 --- a/_testing/grpc/early_adopter/__init__.py +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2015 Google Inc. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. diff --git a/_testing/grpc/early_adopter/implementations.py b/_testing/grpc/early_adopter/implementations.py deleted file mode 100644 index 61e4b7953cea..000000000000 --- a/_testing/grpc/early_adopter/implementations.py +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2015 Google Inc. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. diff --git a/_testing/grpc/framework/__init__.py b/_testing/grpc/framework/__init__.py deleted file mode 100644 index 61e4b7953cea..000000000000 --- a/_testing/grpc/framework/__init__.py +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2015 Google Inc. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. diff --git a/_testing/grpc/framework/alpha/__init__.py b/_testing/grpc/framework/alpha/__init__.py deleted file mode 100644 index 61e4b7953cea..000000000000 --- a/_testing/grpc/framework/alpha/__init__.py +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2015 Google Inc. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. diff --git a/_testing/grpc/framework/alpha/utilities.py b/_testing/grpc/framework/alpha/utilities.py deleted file mode 100644 index 61e4b7953cea..000000000000 --- a/_testing/grpc/framework/alpha/utilities.py +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2015 Google Inc. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. diff --git a/_testing/grpc/framework/common/__init__.py b/_testing/grpc/framework/common/__init__.py deleted file mode 100644 index 61e4b7953cea..000000000000 --- a/_testing/grpc/framework/common/__init__.py +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2015 Google Inc. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. diff --git a/_testing/grpc/framework/common/cardinality.py b/_testing/grpc/framework/common/cardinality.py deleted file mode 100644 index 61e4b7953cea..000000000000 --- a/_testing/grpc/framework/common/cardinality.py +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2015 Google Inc. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. diff --git a/_testing/grpc/framework/interfaces/__init__.py b/_testing/grpc/framework/interfaces/__init__.py deleted file mode 100644 index 61e4b7953cea..000000000000 --- a/_testing/grpc/framework/interfaces/__init__.py +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2015 Google Inc. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. diff --git a/_testing/grpc/framework/interfaces/face/__init__.py b/_testing/grpc/framework/interfaces/face/__init__.py deleted file mode 100644 index 61e4b7953cea..000000000000 --- a/_testing/grpc/framework/interfaces/face/__init__.py +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2015 Google Inc. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. diff --git a/_testing/grpc/framework/interfaces/face/face.py b/_testing/grpc/framework/interfaces/face/face.py deleted file mode 100644 index c098733431fd..000000000000 --- a/_testing/grpc/framework/interfaces/face/face.py +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2016 Google Inc. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. diff --git a/_testing/grpc/framework/interfaces/face/utilities.py b/_testing/grpc/framework/interfaces/face/utilities.py deleted file mode 100644 index 61e4b7953cea..000000000000 --- a/_testing/grpc/framework/interfaces/face/utilities.py +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2015 Google Inc. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. diff --git a/appveyor.yml b/appveyor.yml index c67107d9fa46..fbb5e382a6f2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -31,13 +31,11 @@ environment: PYTHON_VERSION: "3.4.4" PYTHON_ARCH: "32" # Use mocked-up GRPC for now - GRPC_PATH: "_testing" - PYTHON: "C:\\Python34-x64" PYTHON_VERSION: "3.4.4" PYTHON_ARCH: "64" # Use mocked-up GRPC for now - GRPC_PATH: "_testing" # Python 3.5.1 is the latest Python 3.5 with a Windows installer # Python 3.5.1 is the overall latest @@ -46,13 +44,11 @@ environment: PYTHON_VERSION: "3.5.1" PYTHON_ARCH: "32" # Use mocked-up GRPC for now - GRPC_PATH: "_testing" - PYTHON: "C:\\Python35-x64" PYTHON_VERSION: "3.5.1" PYTHON_ARCH: "64" # Use mocked-up GRPC for now - GRPC_PATH: "_testing" install: - ECHO "Filesystem root:" diff --git a/scripts/update_json_docs.sh b/scripts/update_json_docs.sh index a18954204ba0..0a30316c56f0 100755 --- a/scripts/update_json_docs.sh +++ b/scripts/update_json_docs.sh @@ -5,7 +5,7 @@ set -e function buildDocs () { echo "Building JSON documentation..." - PYTHONPATH=_testing python scripts/generate_json_docs.py --tag ${1} + python scripts/generate_json_docs.py --tag ${1} echo "Done building JSON documentation." } diff --git a/tox.ini b/tox.ini index ce63ba19116d..5ab517d3dd33 100644 --- a/tox.ini +++ b/tox.ini @@ -93,8 +93,6 @@ passenv = GH_OWNER GH_OAUTH_TOKEN GH_PROJECT_NAME -setenv = - PYTHONPATH = {toxinidir}/_testing [testenv:docs-rtd] basepython = {[testenv:docs]basepython} @@ -106,7 +104,6 @@ deps = {[testing]deps} {[docs]deps} setenv = - PYTHONPATH = {toxinidir}/_testing LOCAL_RTD = True passenv = {[testenv:docs]passenv} @@ -146,7 +143,6 @@ basepython = commands = python {toxinidir}/system_tests/run_emulator.py --package=datastore setenv = - PYTHONPATH = {toxinidir}/_testing GCLOUD_NO_PRINT=true deps = {[testenv]deps}