Remove all forced branch dependency

googleapis · Jun 4, 2020 · ef2267e · ef2267e
1 parent 36d13b3
commit ef2267e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 33 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -236,7 +236,7 @@ jobs:
  name: Install system dependencies.
  command: |
  apt-get update
- apt-get install -y curl pandoc unzip git
+ apt-get install -y curl pandoc unzip
  - run:
  name: Install nox.
  command: pip install nox
@@ -261,7 +261,7 @@ jobs:
  name: Install system dependencies.
  command: |
  apt-get update
- apt-get install -y curl pandoc unzip git
+ apt-get install -y curl pandoc unzip
  - run:
  name: Install nox.
  command: pip install nox
@@ -302,7 +302,7 @@ jobs:
  name: Install system dependencies.
  command: |
  apt-get update
- apt-get install -y curl pandoc unzip git
+ apt-get install -y curl pandoc unzip
  - run:
  name: Install nox.
  command: pip install nox
@@ -327,7 +327,7 @@ jobs:
  name: Install system dependencies.
  command: |
  apt-get update
- apt-get install -y curl pandoc unzip git
+ apt-get install -y curl pandoc unzip
  - run:
  name: Install nox.
  command: pip install nox
@@ -367,7 +367,7 @@ jobs:
  name: Install system dependencies.
  command: |
  apt-get update
- apt-get install -y curl pandoc unzip git
+ apt-get install -y curl pandoc unzip
  - run:
  name: Install protoc 3.12.1.
  command: |
@@ -391,7 +391,7 @@ jobs:
  name: Install system dependencies.
  command: |
  apt-get update
- apt-get install -y curl pandoc unzip git
+ apt-get install -y curl pandoc unzip
  - run:
  name: Install protoc 3.12.1.
  command: |
@@ -415,7 +415,7 @@ jobs:
  name: Install system dependencies.
  command: |
  apt-get update
- apt-get install -y curl pandoc unzip git
+ apt-get install -y curl pandoc unzip
  - run:
  name: Install protoc 3.12.1.
  command: |
@@ -439,7 +439,7 @@ jobs:
  name: Install system dependencies.
  command: |
  apt-get update
- apt-get install -y curl pandoc unzip git
+ apt-get install -y curl pandoc unzip
  - run:
  name: Install protoc 3.12.1.
  command: |
@@ -463,7 +463,7 @@ jobs:
  name: Install system dependencies.
  command: |
  apt-get update
- apt-get install -y curl pandoc unzip git
+ apt-get install -y curl pandoc unzip
  - run:
  name: Install protoc 3.12.1.
  command: |
@@ -487,7 +487,7 @@ jobs:
  name: Install system dependencies.
  command: |
  apt-get update
- apt-get install -y curl pandoc unzip git
+ apt-get install -y curl pandoc unzip
  - run:
  name: Install protoc 3.12.1.
  command: |

diff --git a/noxfile.py b/noxfile.py
@@ -66,14 +66,6 @@ def showcase(
  session.install("pytest-asyncio")
  session.install("-e", ".")
 
- # TODO(lidiz) Remove this install after api-core released with AsyncIO support
- session.install('-U', 'git+https://github.com/lidizheng/python-api-core.git@aio-integration#egg=google-api-core')
- # TODO(lidiz) Remove the daily build install once new API got released.
- session.install(
- "--pre", "--upgrade", "--force-reinstall",
- "--extra-index-url", "https://packages.grpc.io/archive/2020/04/3dca4a321326dfbf6e3656b6d5fc29cf5f4b6f95-76408568-daeb-49cd-b869-be2fd4066e8f/python",
- "grpcio")
-
  # Install a client library for Showcase.
  with tempfile.TemporaryDirectory() as tmp_dir:
  # Download the Showcase descriptor.
@@ -132,14 +124,6 @@ def showcase_mtls(
  session.install("pytest")
  session.install("-e", ".")
 
- # TODO(lidiz) Remove this install after api-core released with AsyncIO support
- session.install('-U', 'git+https://github.com/lidizheng/python-api-core.git@aio-integration#egg=google-api-core')
- # TODO(lidiz) Remove the daily build install once new API got released.
- session.install(
- "--pre", "--upgrade", "--force-reinstall",
- "--extra-index-url", "https://packages.grpc.io/archive/2020/04/3dca4a321326dfbf6e3656b6d5fc29cf5f4b6f95-76408568-daeb-49cd-b869-be2fd4066e8f/python",
- "grpcio")
-
  # Install a client library for Showcase.
  with tempfile.TemporaryDirectory() as tmp_dir:
  # Download the Showcase descriptor.
@@ -199,18 +183,11 @@ def showcase_unit(
 ):
  """Run the generated unit tests against the Showcase library."""
 
- # Install pytest and gapic-generator-python
  session.install(
  "coverage", "pytest", "pytest-cov", "pytest-xdist", 'asyncmock', 'pytest-asyncio'
  )
  session.install(".")
 
- # TODO(lidiz) Remove the daily build install once new API got released.
- session.install(
- "--pre", "--upgrade", "--force-reinstall",
- "--extra-index-url", "https://packages.grpc.io/archive/2020/04/3dca4a321326dfbf6e3656b6d5fc29cf5f4b6f95-76408568-daeb-49cd-b869-be2fd4066e8f/python",
- "grpcio")
-
  # Install a client library for Showcase.
  with tempfile.TemporaryDirectory() as tmp_dir:
  # Download the Showcase descriptor.