Skip to content

Remove umpyre package accidentally merged into odbcdol (aa5f68e) - #1

Merged
thorwhalen merged 2 commits into
masterfrom
wads/remove-umpyre-pollution
Jul 25, 2026
Merged

thorwhalen merged 2 commits into
masterfrom
wads/remove-umpyre-pollution

Conversation

@thorwhalen

Copy link
Copy Markdown
Member

Remove umpyre package accidentally merged into odbcdol

What happened

Merge aa5f68e — "Merge copilot/repair-ci-tests from umpyre: update CI workflow and add umpyre package" (Dec 2, 2025) — pulled an entire unrelated umpyre project into odbcdol's master. A Copilot branch that belonged in i2mint/umpyre was merged here by mistake. It added:

  • umpyre/ — the whole umpyre package (collectors, storage, cli, schema, config…)
  • a root tests/ dir containing umpyre's tests (test_umpyre_collector.py, test_config.py, …) that import umpyre and yaml
  • planning docs: PHASE_2_PLAN.md, PHASE_3_PLAN.md, IMPLEMENTATION_*.md, QUICK_START.md, STORAGE_STRUCTURE.md, TESTING_GUIDE.md, TEST_RESULTS.md, FAILURE_PROTECTION.md
  • actions/track-metrics/, .github/umpyre-config.yml, a stray metrics json, misc/CHANGELOG.md (umpyre's), test_on_astate.py

This is why CI has been red: the umpyre tests import yaml (undeclared), causing 10 collection errors. It also meant odbcdol's own tests were never actually collected (testpaths pointed at the umpyre root tests/).

What this PR does

  1. Removes all umpyre pollution (commit 1). odbcdol's own package odbcdol/ is untouched; the umpyre work is preserved in git history (aa5f68e) and lives in the separate i2mint/umpyre repo — nothing is lost.
  2. Drops the obsolete setup.cfg + pyproject.toml.migrated (pyproject is the SSOT; setup.py was already removed in 4c38fcf).
  3. wads health pass (commit 2): license table → SPDX string, trove classifiers + keywords, drop the stray pandas dep (it was only for umpyre's tests — odbcdol doesn't use pandas), testpaths → ["odbcdol"] so odbcdol's own tests + module doctests are collected, .editorconfig.
  4. Skip-guards the SQLServerPersister smoke test so it skips (instead of erroring) when no live SQL Server is reachable — CI can now go green without a database service.

Note

odbcdol's own smoke test needs a live SQL Server (localhost:1433). It's now skip-when-unavailable, matching the DB-connector cohort (arangodol#1 / couchdol#1). A follow-up (service container vs. keep-skipped) can decide whether to exercise it in CI. The local test gate could not be run on the authoring machine (no unixodbc; CI installs it via [tool.wads.ops.unixodbc]) — CI on this branch is the verification.

https://claude.ai/code/session_0178HR9RvUNxZzLNbjHRKSfM

Merge aa5f68e ("Merge copilot/repair-ci-tests from umpyre") pulled an entire
unrelated umpyre project into odbcdol's master: the umpyre/ package, its tests
under a root tests/ dir, planning docs (PHASE_*/IMPLEMENTATION_*/etc.), a
track-metrics action, an umpyre-config.yml, a stray metrics json, and umpyre's
CHANGELOG. This removes all of it. odbcdol's own package (odbcdol/) is untouched;
the umpyre work is preserved in git history and in the separate i2mint/umpyre repo.

Also drops the now-obsolete legacy setup.cfg and the pyproject.toml.migrated
artifact (pyproject.toml is the single source of truth).
…stpaths

- license table [project.license]{text=Apache-2.0} -> SPDX string license = "Apache-2.0"
- add trove classifiers + keywords (odbc/pyodbc/sql-server/dol/...)
- drop stray pandas dependency (was added only for the removed umpyre tests;
  odbcdol itself does not use pandas)
- testpaths ["tests"] (the removed umpyre root dir) -> ["odbcdol"] so pytest +
  --doctest-modules collect odbcdol's own tests and module doctests
- skip-guard the SQLServerPersister smoke test so it skips (instead of erroring)
  when no live SQL Server is reachable (CI / dev without a database)
- add .editorconfig (wads template)
@thorwhalen
thorwhalen merged commit 2e13b99 into master Jul 25, 2026
12 checks passed
@thorwhalen
thorwhalen deleted the wads/remove-umpyre-pollution branch July 25, 2026 07:20
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.

1 participant