Skip to content

Commit

Permalink
Update Contrib packages to 0.16dev0 (open-telemetry#129)
Browse files Browse the repository at this point in the history
  • Loading branch information
NathanielRN authored Nov 5, 2020
1 parent 5c9e043 commit 28c1331
Show file tree
Hide file tree
Showing 64 changed files with 140 additions and 139 deletions.
14 changes: 8 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ on:
branches-ignore:
- 'release/*'
pull_request:
env:
CORE_REPO_SHA: 47483865854c7adae7455f8441dab7f814f4ce2a

jobs:
build:
Expand Down Expand Up @@ -32,13 +34,13 @@ jobs:
python-version: py35
package: instrumentation
steps:
- name: Checkout Contrib Repo at SHA - ${{ github.sha }}
- name: Checkout Contrib Repo @ SHA - ${{ github.sha }}
uses: actions/checkout@v2
- name: Checkout Core Repo @ tag v0.15b0
- name: Checkout Core Repo @ SHA - ${{ env.CORE_REPO_SHA }}
uses: actions/checkout@v2
with:
repository: open-telemetry/opentelemetry-python
ref: v0.15b0
ref: ${{ env.CORE_REPO_SHA }}
path: opentelemetry-python-core
- name: Set up Python ${{ env[matrix.python-version] }}
uses: actions/setup-python@v2
Expand All @@ -62,13 +64,13 @@ jobs:
name: ${{ matrix.tox-environment }}
runs-on: ubuntu-latest
steps:
- name: Checkout Contrib Repo at SHA - ${{ github.sha }}
- name: Checkout Contrib Repo @ SHA - ${{ github.sha }}
uses: actions/checkout@v2
- name: Checkout Core Repo @ tag v0.15b0
- name: Checkout Core Repo @ SHA ${{ env.CORE_REPO_SHA }}
uses: actions/checkout@v2
with:
repository: open-telemetry/opentelemetry-python
ref: v0.15b0
ref: ${{ env.CORE_REPO_SHA }}
path: opentelemetry-python-core
- name: Set up Python 3.8
uses: actions/setup-python@v2
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Maintainers ([@open-telemetry/python-maintainers](https://github.com/orgs/open-t
3. Activate your virtual env. `source my_test_venv/bin/activate`.
4. Clone the [OpenTelemetry Python](https://github.com/open-telemetry/opentelemetry-python) Python Core repo to a folder named `opentelemetry-python-core`. `git clone git@github.com:open-telemetry/opentelemetry-python.git opentelemetry-python-core`.
5. Change directory to the repo that was just cloned. `cd opentelemetry-python-core`.
6. Move the head of this repo to the hash you want your tests to use. This is currently the tag `v0.15b0` as seen in `.github/workflows/test.yml`. Use `git fetch --tags && git checkout v0.15b0`.
6. Move the head of this repo to the hash you want your tests to use. This is currently the SHA `47483865854c7adae7455f8441dab7f814f4ce2a` as seen in `.github/workflows/test.yml`. Use `git fetch && git checkout 47483865854c7adae7455f8441dab7f814f4ce2a`.
7. Go back to the root directory. `cd ../`.
8. Make sure you have `tox` installed. `pip install tox`.
9. Run tests for a package. (e.g. `tox -e test-instrumentation-flask`.)
Expand Down
3 changes: 1 addition & 2 deletions _template/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ package_dir=
packages=find_namespace:

install_requires =
# add any package dependencies here
"<REPLACE ME>"
opentelemetry-api == 0.16.dev0

[options.extras_require]
test =
Expand Down
2 changes: 1 addition & 1 deletion _template/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "<REPLACE ME>"
__version__ = "0.16.dev0"
4 changes: 2 additions & 2 deletions exporter/opentelemetry-exporter-datadog/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ package_dir=
packages=find_namespace:
install_requires =
ddtrace>=0.34.0
opentelemetry-api == 0.15b0
opentelemetry-sdk == 0.15b0
opentelemetry-api == 0.16.dev0
opentelemetry-sdk == 0.16.dev0

[options.packages.find]
where = src
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.15b0"
__version__ = "0.16.dev0"
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-api == 0.15b0
opentelemetry-instrumentation == 0.15b0
opentelemetry-api == 0.16.dev0
opentelemetry-instrumentation == 0.16.dev0
aiohttp ~= 3.0
wrapt >= 1.0.0, < 2.0.0

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.15b0"
__version__ = "0.16.dev0"
8 changes: 4 additions & 4 deletions instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-api == 0.15b0
opentelemetry-instrumentation-dbapi == 0.15b0
opentelemetry-instrumentation == 0.15b0
opentelemetry-api == 0.16.dev0
opentelemetry-instrumentation-dbapi == 0.16.dev0
opentelemetry-instrumentation == 0.16.dev0
aiopg >= 0.13.0
wrapt >= 1.0.0, < 2.0.0

[options.extras_require]
test =
opentelemetry-test == 0.15b0
opentelemetry-test == 0.16.dev0

[options.packages.find]
where = src
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.15b0"
__version__ = "0.16.dev0"
4 changes: 2 additions & 2 deletions instrumentation/opentelemetry-instrumentation-asgi/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-api == 0.15b0
opentelemetry-instrumentation == 0.15b0
opentelemetry-api == 0.16.dev0
opentelemetry-instrumentation == 0.16.dev0
asgiref ~= 3.0

[options.extras_require]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.15b0"
__version__ = "0.16.dev0"
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-api == 0.15b0
opentelemetry-instrumentation == 0.15b0
opentelemetry-api == 0.16.dev0
opentelemetry-instrumentation == 0.16.dev0
asyncpg >= 0.12.0

[options.extras_require]
test =
opentelemetry-test == 0.15b0
opentelemetry-test == 0.16.dev0

[options.packages.find]
where = src
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.15b0"
__version__ = "0.16.dev0"
8 changes: 4 additions & 4 deletions instrumentation/opentelemetry-instrumentation-boto/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ package_dir=
packages=find_namespace:
install_requires =
boto ~= 2.0
opentelemetry-api == 0.15b0
opentelemetry-instrumentation == 0.15b0
opentelemetry-instrumentation-botocore == 0.15b0
opentelemetry-api == 0.16.dev0
opentelemetry-instrumentation == 0.16.dev0
opentelemetry-instrumentation-botocore == 0.16.dev0

[options.extras_require]
test =
boto~=2.0
moto~=1.0
opentelemetry-test == 0.15b0
opentelemetry-test == 0.16.dev0

[options.packages.find]
where = src
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.15b0"
__version__ = "0.16.dev0"
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ package_dir=
packages=find_namespace:
install_requires =
botocore ~= 1.0
opentelemetry-api == 0.15b0
opentelemetry-instrumentation == 0.15b0
opentelemetry-api == 0.16.dev0
opentelemetry-instrumentation == 0.16.dev0

[options.extras_require]
test =
moto ~= 1.0
opentelemetry-test == 0.15b0
opentelemetry-test == 0.16.dev0

[options.packages.find]
where = src
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.15b0"
__version__ = "0.16.dev0"
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-api == 0.15b0
opentelemetry-instrumentation == 0.15b0
opentelemetry-api == 0.16.dev0
opentelemetry-instrumentation == 0.16.dev0
celery ~= 4.0

[options.extras_require]
test =
pytest
celery ~= 4.0
opentelemetry-test == 0.15b0
opentelemetry-test == 0.16.dev0

[options.packages.find]
where = src
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.15b0"
__version__ = "0.16.dev0"
6 changes: 3 additions & 3 deletions instrumentation/opentelemetry-instrumentation-dbapi/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-api == 0.15b0
opentelemetry-instrumentation == 0.15b0
opentelemetry-api == 0.16.dev0
opentelemetry-instrumentation == 0.16.dev0
wrapt >= 1.0.0, < 2.0.0

[options.extras_require]
test =
opentelemetry-test == 0.15b0
opentelemetry-test == 0.16.dev0

[options.packages.find]
where = src
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.15b0"
__version__ = "0.16.dev0"
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ package_dir=
packages=find_namespace:
install_requires =
django >= 1.10
opentelemetry-instrumentation-wsgi == 0.15b0
opentelemetry-instrumentation == 0.15b0
opentelemetry-api == 0.15b0
opentelemetry-instrumentation-wsgi == 0.16.dev0
opentelemetry-instrumentation == 0.16.dev0
opentelemetry-api == 0.16.dev0

[options.extras_require]
test =
opentelemetry-test == 0.15b0
opentelemetry-test == 0.16.dev0

[options.packages.find]
where = src
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.15b0"
__version__ = "0.16.dev0"
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-api == 0.15b0
opentelemetry-instrumentation == 0.15b0
opentelemetry-api == 0.16.dev0
opentelemetry-instrumentation == 0.16.dev0
wrapt >= 1.0.0, < 2.0.0
elasticsearch >= 2.0

[options.extras_require]
test =
opentelemetry-test == 0.15b0
opentelemetry-test == 0.16.dev0
elasticsearch-dsl >= 2.0

[options.packages.find]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.15b0"
__version__ = "0.16.dev0"
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@ package_dir=
packages=find_namespace:
install_requires =
falcon ~= 2.0
opentelemetry-instrumentation-wsgi == 0.15b0
opentelemetry-instrumentation == 0.15b0
opentelemetry-api == 0.15b0
opentelemetry-instrumentation-wsgi == 0.16.dev0
opentelemetry-instrumentation == 0.16.dev0
opentelemetry-api == 0.16.dev0

[options.extras_require]
test =
falcon ~= 2.0
opentelemetry-test == 0.15b0
opentelemetry-test == 0.16.dev0
parameterized == 0.7.4

[options.packages.find]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.15b0"
__version__ = "0.16.dev0"
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,16 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-api == 0.15b0
opentelemetry-instrumentation-asgi == 0.15b0
opentelemetry-api == 0.16.dev0
opentelemetry-instrumentation-asgi == 0.16.dev0

[options.entry_points]
opentelemetry_instrumentor =
fastapi = opentelemetry.instrumentation.fastapi:FastAPIInstrumentor

[options.extras_require]
test =
opentelemetry-test == 0.15b0
opentelemetry-test == 0.16.dev0
fastapi ~= 0.58.1
requests ~= 2.23.0 # needed for testclient

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.15b0"
__version__ = "0.16.dev0"
8 changes: 4 additions & 4 deletions instrumentation/opentelemetry-instrumentation-flask/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ package_dir=
packages=find_namespace:
install_requires =
flask ~= 1.0
opentelemetry-instrumentation-wsgi == 0.15b0
opentelemetry-instrumentation == 0.15b0
opentelemetry-api == 0.15b0
opentelemetry-instrumentation-wsgi == 0.16.dev0
opentelemetry-instrumentation == 0.16.dev0
opentelemetry-api == 0.16.dev0

[options.extras_require]
test =
flask~=1.0
opentelemetry-test == 0.15b0
opentelemetry-test == 0.16.dev0

[options.packages.find]
where = src
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.15b0"
__version__ = "0.16.dev0"
Loading

0 comments on commit 28c1331

Please sign in to comment.