Skip to content
This repository was archived by the owner on Oct 21, 2022. It is now read-only.

Commit f6568eb

Browse files
ylil93ylil93
authored
remove opencensus extension packages from whitelists (prepare for 0.1.9) (#336)
* remove opencensus extension packages from whitelists * update deploy file * prepare for 0.1.9
1 parent c959b90 commit f6568eb

File tree

5 files changed

+17
-181
lines changed

5 files changed

+17
-181
lines changed

‎compatibility_lib/compatibility_lib/configs.py‎

Lines changed: 0 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -104,29 +104,6 @@ def _format_url(repo_name, setuppy_path=''):
104104
'grpc-google-iam-v1',
105105
'grpcio',
106106
'opencensus',
107-
'opencensus-correlation',
108-
'opencensus-ext-azure',
109-
'opencensus-ext-dbapi',
110-
'opencensus-ext-django',
111-
'opencensus-ext-flask',
112-
'opencensus-ext-gevent',
113-
'opencensus-ext-google-cloud-clientlibs',
114-
'opencensus-ext-grpc',
115-
'opencensus-ext-httplib',
116-
'opencensus-ext-jaeger',
117-
'opencensus-ext-logging',
118-
'opencensus-ext-mysql',
119-
'opencensus-ext-ocagent',
120-
'opencensus-ext-postgresql',
121-
'opencensus-ext-prometheus',
122-
'opencensus-ext-pymongo',
123-
'opencensus-ext-pymysql',
124-
'opencensus-ext-pyramid',
125-
'opencensus-ext-requests',
126-
'opencensus-ext-sqlalchemy',
127-
'opencensus-ext-stackdriver',
128-
'opencensus-ext-threading',
129-
'opencensus-ext-zipkin',
130107
'protobuf',
131108
'protorpc',
132109
'tensorboard',
@@ -242,58 +219,6 @@ def _format_url(repo_name, setuppy_path=''):
242219
_format_url('apache/beam', 'sdks/python'): 'apache-beam[gcp]',
243220
_format_url('google/apitools'): 'google-apitools',
244221
_format_url('census-instrumentation/opencensus-python'): 'opencensus',
245-
_format_url('census-instrumentation/opencensus-python',
246-
'contrib/opencensus-correlation'): 'opencensus-correlation',
247-
_format_url('census-instrumentation/opencensus-python',
248-
'contrib/opencensus-ext-azure'): 'opencensus-ext-azure',
249-
_format_url('census-instrumentation/opencensus-python',
250-
'contrib/opencensus-ext-dbapi'): 'opencensus-ext-dbapi',
251-
_format_url('census-instrumentation/opencensus-python',
252-
'contrib/opencensus-ext-django'): 'opencensus-ext-django',
253-
_format_url('census-instrumentation/opencensus-python',
254-
'contrib/opencensus-ext-flask'): 'opencensus-ext-flask',
255-
_format_url('census-instrumentation/opencensus-python',
256-
'contrib/opencensus-ext-gevent'): 'opencensus-ext-gevent',
257-
_format_url('census-instrumentation/opencensus-python',
258-
'contrib/opencensus-ext-google-cloud-clientlibs'):
259-
'opencensus-ext-google-cloud-clientlibs',
260-
_format_url('census-instrumentation/opencensus-python',
261-
'contrib/opencensus-ext-grpc'): 'opencensus-ext-grpc',
262-
_format_url('census-instrumentation/opencensus-python',
263-
'contrib/opencensus-ext-httplib'): 'opencensus-ext-httplib',
264-
_format_url('census-instrumentation/opencensus-python',
265-
'contrib/opencensus-ext-jaeger'): 'opencensus-ext-jaeger',
266-
_format_url('census-instrumentation/opencensus-python',
267-
'contrib/opencensus-ext-logging'): 'opencensus-ext-logging',
268-
_format_url('census-instrumentation/opencensus-python',
269-
'contrib/opencensus-ext-mysql'): 'opencensus-ext-mysql',
270-
_format_url('census-instrumentation/opencensus-python',
271-
'contrib/opencensus-ext-ocagent'): 'opencensus-ext-ocagent',
272-
_format_url('census-instrumentation/opencensus-python',
273-
'contrib/opencensus-ext-postgresql'):
274-
'opencensus-ext-postgresql',
275-
_format_url('census-instrumentation/opencensus-python',
276-
'contrib/opencensus-ext-prometheus'):
277-
'opencensus-ext-prometheus',
278-
_format_url('census-instrumentation/opencensus-python',
279-
'contrib/opencensus-ext-pymongo'): 'opencensus-ext-pymongo',
280-
_format_url('census-instrumentation/opencensus-python',
281-
'contrib/opencensus-ext-pymysql'): 'opencensus-ext-pymysql',
282-
_format_url('census-instrumentation/opencensus-python',
283-
'contrib/opencensus-ext-pyramid'): 'opencensus-ext-pyramid',
284-
_format_url('census-instrumentation/opencensus-python',
285-
'contrib/opencensus-ext-requests'): 'opencensus-ext-requests',
286-
_format_url('census-instrumentation/opencensus-python',
287-
'contrib/opencensus-ext-sqlalchemy'):
288-
'opencensus-ext-sqlalchemy',
289-
_format_url('census-instrumentation/opencensus-python',
290-
'contrib/opencensus-ext-stackdriver'):
291-
'opencensus-ext-stackdriver',
292-
_format_url('census-instrumentation/opencensus-python',
293-
'contrib/opencensus-ext-threading'):
294-
'opencensus-ext-threading',
295-
_format_url('census-instrumentation/opencensus-python',
296-
'contrib/opencensus-ext-zipkin'): 'opencensus-ext-zipkin',
297222
_format_url('google/protorpc'): 'protorpc',
298223
_format_url('tensorflow/tensorflow', 'tensorflow/tools/pip_package'):
299224
'tensorflow',

‎compatibility_lib/setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
setuptools.setup(
2525
name="compatibility_lib",
26-
version="0.1.8",
26+
version="0.1.9",
2727
author="Cloud Python",
2828
description="A library to get and store the dependency compatibility "
2929
"status data to BigQuery.",

‎compatibility_server/configs.py‎

Lines changed: 0 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -104,29 +104,6 @@ def _format_url(repo_name, setuppy_path=''):
104104
'grpc-google-iam-v1',
105105
'grpcio',
106106
'opencensus',
107-
'opencensus-correlation',
108-
'opencensus-ext-azure',
109-
'opencensus-ext-dbapi',
110-
'opencensus-ext-django',
111-
'opencensus-ext-flask',
112-
'opencensus-ext-gevent',
113-
'opencensus-ext-google-cloud-clientlibs',
114-
'opencensus-ext-grpc',
115-
'opencensus-ext-httplib',
116-
'opencensus-ext-jaeger',
117-
'opencensus-ext-logging',
118-
'opencensus-ext-mysql',
119-
'opencensus-ext-ocagent',
120-
'opencensus-ext-postgresql',
121-
'opencensus-ext-prometheus',
122-
'opencensus-ext-pymongo',
123-
'opencensus-ext-pymysql',
124-
'opencensus-ext-pyramid',
125-
'opencensus-ext-requests',
126-
'opencensus-ext-sqlalchemy',
127-
'opencensus-ext-stackdriver',
128-
'opencensus-ext-threading',
129-
'opencensus-ext-zipkin',
130107
'protobuf',
131108
'protorpc',
132109
'tensorboard',
@@ -242,58 +219,6 @@ def _format_url(repo_name, setuppy_path=''):
242219
_format_url('apache/beam', 'sdks/python'): 'apache-beam[gcp]',
243220
_format_url('google/apitools'): 'google-apitools',
244221
_format_url('census-instrumentation/opencensus-python'): 'opencensus',
245-
_format_url('census-instrumentation/opencensus-python',
246-
'contrib/opencensus-correlation'): 'opencensus-correlation',
247-
_format_url('census-instrumentation/opencensus-python',
248-
'contrib/opencensus-ext-azure'): 'opencensus-ext-azure',
249-
_format_url('census-instrumentation/opencensus-python',
250-
'contrib/opencensus-ext-dbapi'): 'opencensus-ext-dbapi',
251-
_format_url('census-instrumentation/opencensus-python',
252-
'contrib/opencensus-ext-django'): 'opencensus-ext-django',
253-
_format_url('census-instrumentation/opencensus-python',
254-
'contrib/opencensus-ext-flask'): 'opencensus-ext-flask',
255-
_format_url('census-instrumentation/opencensus-python',
256-
'contrib/opencensus-ext-gevent'): 'opencensus-ext-gevent',
257-
_format_url('census-instrumentation/opencensus-python',
258-
'contrib/opencensus-ext-google-cloud-clientlibs'):
259-
'opencensus-ext-google-cloud-clientlibs',
260-
_format_url('census-instrumentation/opencensus-python',
261-
'contrib/opencensus-ext-grpc'): 'opencensus-ext-grpc',
262-
_format_url('census-instrumentation/opencensus-python',
263-
'contrib/opencensus-ext-httplib'): 'opencensus-ext-httplib',
264-
_format_url('census-instrumentation/opencensus-python',
265-
'contrib/opencensus-ext-jaeger'): 'opencensus-ext-jaeger',
266-
_format_url('census-instrumentation/opencensus-python',
267-
'contrib/opencensus-ext-logging'): 'opencensus-ext-logging',
268-
_format_url('census-instrumentation/opencensus-python',
269-
'contrib/opencensus-ext-mysql'): 'opencensus-ext-mysql',
270-
_format_url('census-instrumentation/opencensus-python',
271-
'contrib/opencensus-ext-ocagent'): 'opencensus-ext-ocagent',
272-
_format_url('census-instrumentation/opencensus-python',
273-
'contrib/opencensus-ext-postgresql'):
274-
'opencensus-ext-postgresql',
275-
_format_url('census-instrumentation/opencensus-python',
276-
'contrib/opencensus-ext-prometheus'):
277-
'opencensus-ext-prometheus',
278-
_format_url('census-instrumentation/opencensus-python',
279-
'contrib/opencensus-ext-pymongo'): 'opencensus-ext-pymongo',
280-
_format_url('census-instrumentation/opencensus-python',
281-
'contrib/opencensus-ext-pymysql'): 'opencensus-ext-pymysql',
282-
_format_url('census-instrumentation/opencensus-python',
283-
'contrib/opencensus-ext-pyramid'): 'opencensus-ext-pyramid',
284-
_format_url('census-instrumentation/opencensus-python',
285-
'contrib/opencensus-ext-requests'): 'opencensus-ext-requests',
286-
_format_url('census-instrumentation/opencensus-python',
287-
'contrib/opencensus-ext-sqlalchemy'):
288-
'opencensus-ext-sqlalchemy',
289-
_format_url('census-instrumentation/opencensus-python',
290-
'contrib/opencensus-ext-stackdriver'):
291-
'opencensus-ext-stackdriver',
292-
_format_url('census-instrumentation/opencensus-python',
293-
'contrib/opencensus-ext-threading'):
294-
'opencensus-ext-threading',
295-
_format_url('census-instrumentation/opencensus-python',
296-
'contrib/opencensus-ext-zipkin'): 'opencensus-ext-zipkin',
297222
_format_url('google/protorpc'): 'protorpc',
298223
_format_url('tensorflow/tensorflow', 'tensorflow/tools/pip_package'):
299224
'tensorflow',

‎compatibility_server/deployment/deploy.yaml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ apiVersion: extensions/v1beta1
22
kind: Deployment
33
metadata:
44
annotations:
5-
creationTimestamp: "2018-06-15T20:08:48Z"
6-
deployment.kubernetes.io/revision: "36"
5+
creationTimestamp: 2018-06-15T20:08:48Z
6+
deployment.kubernetes.io/revision: "44"
77
kubectl.kubernetes.io/last-applied-configuration: |
8-
{"apiVersion":"extensions/v1beta1","kind":"Deployment","metadata":{"annotations":{"creationTimestamp":"2018-06-15T20:08:48Z","deployment.kubernetes.io/revision":"33"},"creationTimestamp":"2018-06-15T20:08:48Z","generation":98,"labels":{"run":"compatibility-server"},"name":"compatibility-server","namespace":"default","resourceVersion":"59364428","selfLink":"/apis/extensions/v1beta1/namespaces/default/deployments/compatibility-server","uid":"ea4ab52b-70d7-11e8-8f57-42010a800003"},"spec":{"progressDeadlineSeconds":600,"replicas":10,"revisionHistoryLimit":10,"selector":{"matchLabels":{"run":"compatibility-server"}},"strategy":{"rollingUpdate":{"maxSurge":1,"maxUnavailable":1},"type":"RollingUpdate"},"template":{"metadata":{"creationTimestamp":null,"labels":{"run":"compatibility-server"}},"spec":{"containers":[{"image":"gcr.io/python-compatibility-tools/compatibility-server:v28","imagePullPolicy":"IfNotPresent","name":"compatibility-server","ports":[{"containerPort":8888,"protocol":"TCP"}],"resources":{},"terminationMessagePath":"/dev/termination-log","terminationMessagePolicy":"File","volumeMounts":[{"mountPath":"/var/run/docker.sock","name":"docker-sock"}]}],"dnsPolicy":"ClusterFirst","restartPolicy":"Always","schedulerName":"default-scheduler","securityContext":{},"terminationGracePeriodSeconds":310,"volumes":[{"hostPath":{"path":"/var/run/docker.sock","type":"File"},"name":"docker-sock"}]}}},"status":{"availableReplicas":10,"conditions":[{"lastTransitionTime":"2019-03-01T17:42:26Z","lastUpdateTime":"2019-03-09T17:38:22Z","message":"ReplicaSet \"compatibility-server-7bb97bfdc4\" has successfully progressed.","reason":"NewReplicaSetAvailable","status":"True","type":"Progressing"},{"lastTransitionTime":"2019-03-10T02:36:44Z","lastUpdateTime":"2019-03-10T02:36:44Z","message":"Deployment has minimum availability.","reason":"MinimumReplicasAvailable","status":"True","type":"Available"}],"observedGeneration":98,"readyReplicas":10,"replicas":10,"updatedReplicas":10}}
9-
creationTimestamp: "2018-06-15T20:08:48Z"
10-
generation: 102
8+
{"apiVersion":"extensions/v1beta1","kind":"Deployment","metadata":{"annotations":{"creationTimestamp":"2018-06-15T20:08:48Z","deployment.kubernetes.io/revision":"41"},"creationTimestamp":"2018-06-15T20:08:48Z","generation":108,"labels":{"run":"compatibility-server"},"name":"compatibility-server","namespace":"default","resourceVersion":"128704700","selfLink":"/apis/extensions/v1beta1/namespaces/default/deployments/compatibility-server","uid":"ea4ab52b-70d7-11e8-8f57-42010a800003"},"spec":{"progressDeadlineSeconds":600,"replicas":200,"revisionHistoryLimit":10,"selector":{"matchLabels":{"run":"compatibility-server"}},"strategy":{"rollingUpdate":{"maxSurge":1,"maxUnavailable":1},"type":"RollingUpdate"},"template":{"metadata":{"creationTimestamp":null,"labels":{"run":"compatibility-server"}},"spec":{"containers":[{"image":"gcr.io/python-compatibility-tools/compatibility-image:v31","imagePullPolicy":"IfNotPresent","name":"compatibility-server","ports":[{"containerPort":8888,"protocol":"TCP"}],"resources":{},"terminationMessagePath":"/dev/termination-log","terminationMessagePolicy":"File","volumeMounts":[{"mountPath":"/var/run/docker.sock","name":"docker-sock"}]}],"dnsPolicy":"ClusterFirst","restartPolicy":"Always","schedulerName":"default-scheduler","securityContext":{},"terminationGracePeriodSeconds":310,"volumes":[{"hostPath":{"path":"/var/run/docker.sock","type":"File"},"name":"docker-sock"}]}}},"status":{"availableReplicas":200,"conditions":[{"lastTransitionTime":"2019-06-13T15:32:29Z","lastUpdateTime":"2019-06-13T15:32:29Z","message":"Deployment has minimum availability.","reason":"MinimumReplicasAvailable","status":"True","type":"Available"},{"lastTransitionTime":"2019-06-12T00:53:51Z","lastUpdateTime":"2019-06-13T17:01:09Z","message":"ReplicaSet \"compatibility-server-6484ffd4f6\" has successfully progressed.","reason":"NewReplicaSetAvailable","status":"True","type":"Progressing"}],"observedGeneration":108,"readyReplicas":200,"replicas":200,"updatedReplicas":200}}
9+
creationTimestamp: 2018-06-15T20:08:48Z
10+
generation: 111
1111
labels:
1212
run: compatibility-server
1313
name: compatibility-server
1414
namespace: default
15-
resourceVersion: "127286413"
15+
resourceVersion: "128786447"
1616
selfLink: /apis/extensions/v1beta1/namespaces/default/deployments/compatibility-server
1717
uid: ea4ab52b-70d7-11e8-8f57-42010a800003
1818
spec:
@@ -34,7 +34,7 @@ spec:
3434
run: compatibility-server
3535
spec:
3636
containers:
37-
- image: gcr.io/python-compatibility-tools/compatibility-image:v30
37+
- image: gcr.io/python-compatibility-tools/compatibility-image:v33
3838
imagePullPolicy: IfNotPresent
3939
name: compatibility-server
4040
ports:
@@ -59,19 +59,19 @@ spec:
5959
status:
6060
availableReplicas: 200
6161
conditions:
62-
- lastTransitionTime: "2019-03-01T17:42:26Z"
63-
lastUpdateTime: "2019-06-10T21:44:33Z"
64-
message: ReplicaSet "compatibility-server-84769766f4" has successfully progressed.
65-
reason: NewReplicaSetAvailable
66-
status: "True"
67-
type: Progressing
68-
- lastTransitionTime: "2019-06-11T20:55:19Z"
69-
lastUpdateTime: "2019-06-11T20:55:19Z"
62+
- lastTransitionTime: 2019-06-13T19:21:20Z
63+
lastUpdateTime: 2019-06-13T19:21:20Z
7064
message: Deployment has minimum availability.
7165
reason: MinimumReplicasAvailable
7266
status: "True"
7367
type: Available
74-
observedGeneration: 102
68+
- lastTransitionTime: 2019-06-12T00:53:51Z
69+
lastUpdateTime: 2019-06-13T19:21:30Z
70+
message: ReplicaSet "compatibility-server-589994f6bc" has successfully progressed.
71+
reason: NewReplicaSetAvailable
72+
status: "True"
73+
type: Progressing
74+
observedGeneration: 111
7575
readyReplicas: 200
7676
replicas: 200
7777
updatedReplicas: 200

‎compatibility_server/pip_checker.py‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,6 @@
4747
'google-cloud-python.git#subdirectory=')
4848
CLIENTLIBS_GITHUB_URL = 'https://github.com/googleapis/google-cloud-python.git'
4949

50-
GITHUB_OPENCENSUS_PREFIX = ('git+git://github.com/census-instrumentation/'
51-
'opencensus-python.git#subdirectory=')
52-
OPENCENSUS_GITHUB_URL = ('https://github.com/census-instrumentation/'
53-
'opencensus-python.git')
54-
5550
# Pattern for pip installation errors not related to the package being
5651
# installed. See:
5752
# https://github.com/pypa/pip/blob/3a77bd667cc68935040563e1351604c461ce5333/src/pip/_internal/commands/install.py#L533
@@ -437,21 +432,12 @@ def _install(self, container: docker.models.containers.Container):
437432
client_repo_directory = self._clone_repo(
438433
container, CLIENTLIBS_GITHUB_URL)
439434

440-
opencensus_repo_directory = ''
441-
if any(GITHUB_OPENCENSUS_PREFIX in pkg for pkg in self._packages):
442-
opencensus_repo_directory = self._clone_repo(
443-
container, OPENCENSUS_GITHUB_URL)
444-
445435
install_names = []
446436
for pkg in self._packages:
447437
if GITHUB_CLIENTLIBS_PREFIX in pkg:
448438
install_subdirectory = pkg.split(GITHUB_CLIENTLIBS_PREFIX)[1]
449439
install_names.append(
450440
os.path.join(client_repo_directory, install_subdirectory))
451-
elif GITHUB_OPENCENSUS_PREFIX in pkg:
452-
install_subdirectory = pkg.split(GITHUB_OPENCENSUS_PREFIX)[1]
453-
install_names.append(os.path.join(
454-
opencensus_repo_directory, install_subdirectory))
455441
else:
456442
install_names.append(pkg)
457443

0 commit comments

Comments
 (0)