Skip to content

Commit c51320d

Browse files
authored
refactor namespace package - cleanup opencensus root folder (census-instrumentation#493)
* refactor namespace package - cleanup opencensus root folder * remove TODO comment * exclude tests folder from package * rename __version__.py to version.py
1 parent f029bcd commit c51320d

File tree

9 files changed

+10
-29
lines changed

9 files changed

+10
-29
lines changed

opencensus/__init__.py

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1 @@
1-
# Copyright 2017, OpenCensus Authors
2-
#
3-
# Licensed under the Apache License, Version 2.0 (the "License");
4-
# you may not use this file except in compliance with the License.
5-
# You may obtain a copy of the License at
6-
#
7-
# http://www.apache.org/licenses/LICENSE-2.0
8-
#
9-
# Unless required by applicable law or agreed to in writing, software
10-
# distributed under the License is distributed on an "AS IS" BASIS,
11-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
# See the License for the specific language governing permissions and
13-
# limitations under the License.
14-
15-
try:
16-
import pkg_resources
17-
pkg_resources.declare_namespace(__name__)
18-
except ImportError: # pragma: NO COVER
19-
import pkgutil
20-
__path__ = pkgutil.extend_path(__path__, __name__)
1+
__path__ = __import__('pkgutil').extend_path(__path__, __name__)

opencensus/__version__.py renamed to opencensus/common/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2018, OpenCensus Authors
1+
# Copyright 2019, OpenCensus Authors
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

opencensus/stats/exporters/stackdriver_exporter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
from google.api_core.gapic_v1 import client_info
2424
from google.cloud import monitoring_v3
2525

26-
from opencensus.__version__ import __version__
2726
from opencensus.common import utils
2827
from opencensus.common.monitored_resource_util.monitored_resource_util \
2928
import MonitoredResourceUtil
3029
from opencensus.common.transports import async_
30+
from opencensus.common.version import __version__
3131
from opencensus.stats import aggregation
3232
from opencensus.stats import measure
3333
from opencensus.stats.exporters import base

opencensus/trace/exporters/ocagent/trace_exporter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
import os
2020
import socket
2121

22-
from opencensus.__version__ import __version__
2322
from opencensus.common.transports import sync
23+
from opencensus.common.version import __version__
2424
from opencensus.trace.exporters import base
2525
from opencensus.trace.exporters.gen.opencensus.agent.common.v1 \
2626
import common_pb2

opencensus/trace/exporters/stackdriver_exporter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717

1818
from google.cloud.trace.client import Client
1919

20-
from opencensus.__version__ import __version__
2120
from opencensus.common.monitored_resource_util.monitored_resource_util \
2221
import MonitoredResourceUtil
2322
from opencensus.common.transports import sync
23+
from opencensus.common.version import __version__
2424
from opencensus.trace import attributes_helper
2525
from opencensus.trace import span_data
2626
from opencensus.trace.attributes import Attributes

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
'google-api-core >= 1.0.0, < 2.0.0',
2727
]
2828

29-
exec(open("opencensus/__version__.py").read())
29+
exec(open("opencensus/common/version.py").read())
3030
setup(
3131
name='opencensus',
3232
version=__version__, # noqa
@@ -51,6 +51,6 @@
5151
install_requires=install_requires,
5252
extras_require=extras,
5353
license='Apache-2.0',
54-
packages=find_packages(),
54+
packages=find_packages(exclude=('tests',)),
5555
namespace_packages=[],
5656
url='https://github.com/census-instrumentation/opencensus-python')

tests/unit/stats/exporters/test_stackdriver_stats.py

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

1919
from google.cloud import monitoring_v3
2020

21-
from opencensus.__version__ import __version__
21+
from opencensus.common.version import __version__
2222
from opencensus.stats import aggregation as aggregation_module
2323
from opencensus.stats import aggregation_data as aggregation_data_module
2424
from opencensus.stats import execution_context

tests/unit/trace/exporters/ocagent/test_trace_exporter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import socket
2020
import unittest
2121

22-
from opencensus.__version__ import __version__
22+
from opencensus.common.version import __version__
2323
from opencensus.trace import span_context as span_context_module
2424
from opencensus.trace import span_data as span_data_module
2525
from opencensus.trace.exporters.gen.opencensus.trace.v1 import trace_config_pb2

tests/unit/trace/exporters/test_stackdriver_exporter.py

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

1717
import mock
1818

19-
from opencensus.__version__ import __version__
19+
from opencensus.common.version import __version__
2020
from opencensus.trace import span_context
2121
from opencensus.trace import span_data as span_data_module
2222
from opencensus.trace.exporters import stackdriver_exporter

0 commit comments

Comments
 (0)