Include version.py in distribution for certain packages (#1143)

lzchen · web-flow · commit 9880318c606f · 2022-08-02T11:10:50.000-07:00
diff --git a/context/opencensus-context/CHANGELOG.md b/context/opencensus-context/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+- Move `version.py` file into `runtime_context` folder
+([#1143](https://github.com/census-instrumentation/opencensus-python/pull/1143))
+
 ## 0.1.2
 Released 2020-06-29
 
diff --git a/context/opencensus-context/opencensus/common/runtime_context/version.py b/context/opencensus-context/opencensus/common/runtime_context/version.py
diff --git a/context/opencensus-context/setup.py b/context/opencensus-context/setup.py
@@ -12,13 +12,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import os
+
 from setuptools import find_packages, setup
 
-from version import __version__
+BASE_DIR = os.path.dirname(__file__)
+VERSION_FILENAME = os.path.join(
+    BASE_DIR, "opencensus", "common", "runtime_context", "version.py"
+)
+PACKAGE_INFO = {}
+with open(VERSION_FILENAME) as f:
+    exec(f.read(), PACKAGE_INFO)
 
 setup(
     name='opencensus-context',
-    version=__version__,  # noqa
+    version=PACKAGE_INFO["__version__"],  # noqa
     author='OpenCensus Authors',
     author_email='census-developers@googlegroups.com',
     classifiers=[
diff --git a/contrib/opencensus-ext-flask/CHANGELOG.md b/contrib/opencensus-ext-flask/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+- Move `version.py` file into `common` folder
+([#1143](https://github.com/census-instrumentation/opencensus-python/pull/1143))
+
 ## 0.8.0
 Released 2022-04-20
 
diff --git a/contrib/opencensus-ext-flask/opencensus/ext/flask/common/__init__.py b/contrib/opencensus-ext-flask/opencensus/ext/flask/common/__init__.py
@@ -0,0 +1 @@
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)
diff --git a/contrib/opencensus-ext-flask/opencensus/ext/flask/common/version.py b/contrib/opencensus-ext-flask/opencensus/ext/flask/common/version.py
diff --git a/contrib/opencensus-ext-flask/setup.py b/contrib/opencensus-ext-flask/setup.py
@@ -12,13 +12,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import os
+
 from setuptools import find_packages, setup
 
-from version import __version__
+BASE_DIR = os.path.dirname(__file__)
+VERSION_FILENAME = os.path.join(
+    BASE_DIR, "opencensus", "ext", "flask", "common", "version.py"
+)
+PACKAGE_INFO = {}
+with open(VERSION_FILENAME) as f:
+    exec(f.read(), PACKAGE_INFO)
 
 setup(
     name='opencensus-ext-flask',
-    version=__version__,  # noqa
+    version=PACKAGE_INFO["__version__"],  # noqa
     author='OpenCensus Authors',
     author_email='census-developers@googlegroups.com',
     classifiers=[
diff --git a/contrib/opencensus-ext-requests/CHANGELOG.md b/contrib/opencensus-ext-requests/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Move `version.py` file into `common` folder
+([#1143](https://github.com/census-instrumentation/opencensus-python/pull/1143))
 - Add `requests` library as a hard dependency
 ([#1146](https://github.com/census-instrumentation/opencensus-python/pull/1146))
 
diff --git a/contrib/opencensus-ext-requests/opencensus/ext/requests/common/__init__.py b/contrib/opencensus-ext-requests/opencensus/ext/requests/common/__init__.py
@@ -0,0 +1 @@
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)
diff --git a/contrib/opencensus-ext-requests/opencensus/ext/requests/common/version.py b/contrib/opencensus-ext-requests/opencensus/ext/requests/common/version.py
diff --git a/contrib/opencensus-ext-requests/setup.py b/contrib/opencensus-ext-requests/setup.py
@@ -12,13 +12,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import os
+
 from setuptools import find_packages, setup
 
-from version import __version__
+BASE_DIR = os.path.dirname(__file__)
+VERSION_FILENAME = os.path.join(
+    BASE_DIR, "opencensus", "ext", "requests", "common", "version.py"
+)
+PACKAGE_INFO = {}
+with open(VERSION_FILENAME) as f:
+    exec(f.read(), PACKAGE_INFO)
 
 setup(
     name='opencensus-ext-requests',
-    version=__version__,  # noqa
+    version=PACKAGE_INFO["__version__"],  # noqa
     author='OpenCensus Authors',
     author_email='census-developers@googlegroups.com',
     classifiers=[
diff --git a/tox.ini b/tox.ini
@@ -50,7 +50,7 @@ deps =
   unit,lint,bandit: -e contrib/opencensus-ext-threading
   unit,lint,bandit: -e contrib/opencensus-ext-zipkin
   unit,lint,bandit: -e contrib/opencensus-ext-google-cloud-clientlibs
-  lint: flake8
+  lint: flake8 ~= 4.0.1
   lint: isort ~= 4.3.21
   setup: docutils
   setup: pygments
@@ -68,4 +68,4 @@ commands =
   bandit: bandit -r context/ contrib/ opencensus/ -lll -q
   py39-setup: python setup.py check --restructuredtext --strict
   py39-docs: bash ./scripts/update_docs.sh
-  ; TODO deployment
+  ; TODO deployment

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+__path__ = __import__('pkgutil').extend_path(__path__, __name__)`