Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(py): Move pytest.ini to tests directory #2204

Merged
merged 3 commits into from Jun 12, 2023
Merged

Conversation

jjbayer
Copy link
Member

@jjbayer jjbayer commented Jun 12, 2023

Our CI uses an unpinned version of pytest. pytest 7.3.2 includes the following fix:

#10987: testpaths is now honored to load root conftests.

(changelog)

In our case, this led to an import error, because the CI job running tests in py/ does not install the requirements needed to configure our python integration tests. Moving the pytest.ini file to tests/ fixes the issue.

#skip-changelog

@jjbayer jjbayer changed the title build(py): Move integration specific config to folder build(py): Move pytest.ini to tests directory Jun 12, 2023
@jjbayer jjbayer marked this pull request as ready for review June 12, 2023 11:54
@jjbayer jjbayer requested a review from a team June 12, 2023 11:54
Copy link
Contributor

@olksdr olksdr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

Copy link
Member

@iker-barriocanal iker-barriocanal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for doing this!

@jjbayer jjbayer enabled auto-merge (squash) June 12, 2023 12:11
@jjbayer jjbayer merged commit 2ad761f into master Jun 12, 2023
17 checks passed
@jjbayer jjbayer deleted the build/ini-file branch June 12, 2023 12:14
jan-auer added a commit that referenced this pull request Jun 14, 2023
* master: (32 commits)
  feat(txname): Mark all URL transactions as sanitized (#2210)
  fix(profiles): Enforce profile quotas on metrics buckets (#2212)
  revert(spans): Move span metrics back to transactions namespace (#2206)
  instr(metrics): Add values to invalid metric errors (#2201)
  ref(spans): Move span metrics to spans namespace (#2205)
  chore(protocol): Add missing py/changelog entry for lock property (#2203)
  build(py): Move pytest.ini to tests directory (#2204)
  ref: Use serde collect_str to avoid allocations (#2149)
  chore(gocd): Auto approve deploy relay-pop on check success (#2200)
  test(document-pii): Fix flaky test (#2198)
  feat(spans): Extract transaction `user` into span's databag (#2197)
  feat(spans): Extract `release` tag from the transaction to the span (#2189)
  ref(metrics-extraction): Split span and transaction metric extraction (#2191)
  ref(crons): Support GET in the check-in endpoint (#2192)
  ref(spans): Introduce opinionated casing in span metrics (#2193)
  chore(py): Bump `requests` lib version (#2194)
  doc: document pii fields (#1972)
  feat: Added cron specific endpoint (#2153)
  feat(profiling): Extract app identifier from app context (#2172)
  feat(ci): Add CI-check for pop-deploys  (#2184)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants