Skip to content

Add deps/ unconditionally#307

Merged
MarcelGeo merged 1 commit into
fix-ssl-certificatesfrom
add_deps_on_syspath
Jul 6, 2026
Merged

Add deps/ unconditionally#307
MarcelGeo merged 1 commit into
fix-ssl-certificatesfrom
add_deps_on_syspath

Conversation

@harminius

Copy link
Copy Markdown
Contributor

Put dependencies in deps/ dir on sys.path unconditionally. The host (QGIS) may already provide some (like dateutil), which previously skipped this bundling step.

@harminius harminius requested a review from wonder-sk July 3, 2026 15:08
@coveralls

Copy link
Copy Markdown

Coverage Report for CI Build 28668762831

Coverage increased (+0.05%) to 83.413%

Details

  • Coverage increased (+0.05%) from the base build.
  • Patch coverage: 5 uncovered changes across 1 file (4 of 9 lines covered, 44.44%).
  • No coverage regressions found.

Uncovered Changes

File Changed Covered %
mergin/common.py 9 4 44.44%

Coverage Regressions

No coverage regressions found.


Coverage Stats

Coverage Status
Relevant Lines: 5673
Covered Lines: 4732
Line Coverage: 83.41%
Coverage Strength: 0.83 hits per line

💛 - Coveralls

Comment thread mergin/common.py

try:
import dateutil.parser
from dateutil.tz import tzlocal

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

It's not eough to add here also trustore?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

truststore is not used here..
we don't need it to import it e.g. for CLI

@MarcelGeo MarcelGeo merged commit 4e7a29f into fix-ssl-certificates Jul 6, 2026
5 checks passed
@MarcelGeo MarcelGeo deleted the add_deps_on_syspath branch July 6, 2026 08:46
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.

3 participants