Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
zhihali authored Jun 6, 2024
2 parents 6334ae4 + 762bd8f commit 71d419b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 12 deletions.
4 changes: 4 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ on how to become a [**Member**](https://github.com/open-telemetry/community/blob
[**Approver**](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver)
and [**Maintainer**](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer).

Before you can contribute, you will need to sign the [Contributor License Agreement](https://docs.linuxfoundation.org/lfx/easycla/contributors).

Please also read the [OpenTelemetry Contributor Guide](https://github.com/open-telemetry/community/blob/main/CONTRIBUTING.md).

# Find your right repo

This is the main repo for OpenTelemetry Python. Nevertheless, there are other repos that are related to this project.
Expand Down
14 changes: 2 additions & 12 deletions scripts/eachdist.py
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,6 @@ def setup_instparser(instparser):

setup_instparser(instparser)
instparser.add_argument("--editable", "-e", action="store_true")
instparser.add_argument("--with-test-deps", action="store_true")
instparser.add_argument("--with-dev-deps", action="store_true")
instparser.add_argument("--eager-upgrades", action="store_true")

Expand All @@ -208,7 +207,6 @@ def setup_instparser(instparser):
editable=True,
with_dev_deps=True,
eager_upgrades=True,
with_test_deps=True,
)

lintparser = subparsers.add_parser(
Expand Down Expand Up @@ -466,16 +464,7 @@ def install_args(args):
check=True,
)

allfmt = "-e 'file://{}" if args.editable else "'file://{}"
# packages should provide an extra_requires that is named
# 'test', to denote test dependencies.
extras = []
if args.with_test_deps:
extras.append("test")
if extras:
allfmt += f"[{','.join(extras)}]"
# note the trailing single quote, to close the quote opened above.
allfmt += "'"
allfmt = "-e 'file://{}'" if args.editable else "'file://{}'"

execute_args(
parse_subargs(
Expand All @@ -488,6 +477,7 @@ def install_args(args):
),
)
)

if args.with_dev_deps:
rootpath = find_projectroot()
runsubprocess(
Expand Down

0 comments on commit 71d419b

Please sign in to comment.