docs: update .wip files with current migration state

Updated migration documentation to reflect:
- Private shim removal (_config.py, _version_cls.py, _cli.py, _get_version_impl.py)
- Direct imports from vcs_versioning in __init__.py
- Console entry points using vcs_versioning._cli:main
- dump_version migration to vcs_versioning
- Config module privacy (config.py → _config.py)
- Test suite status (408 passing)
- Current package structure and file locations

Author: RonnyPfannschmidt

.wip/api-mapping.md

@@ -17,9 +17,9 @@
 
 | API | Location | Notes |
 |-----|----------|-------|
-| `setuptools_scm.get_version` | `setuptools_scm._get_version_impl` | Soft deprecated, wraps vcs_versioning |
-| `setuptools_scm._get_version` | `setuptools_scm._get_version_impl` | Internal, wraps vcs_versioning |
-| `setuptools_scm.dump_version` | `setuptools_scm._integration.dump_version` | Soft deprecated |
+| `setuptools_scm.get_version` | `vcs_versioning._get_version_impl` | Soft deprecated, re-exported from vcs_versioning |
+| `setuptools_scm._get_version` | `vcs_versioning._get_version_impl` | Re-exported from vcs_versioning |
+| `setuptools_scm.dump_version` | `vcs_versioning._dump_version` | Soft deprecated, re-exported from vcs_versioning |
 
 ### Private Modules (moved to vcs_versioning)
 
@@ -35,12 +35,17 @@
 
 ### Backward Compatibility Stubs (setuptools_scm)
 
-These modules re-export from vcs_versioning for backward compatibility:
+These **public** modules re-export from vcs_versioning for backward compatibility:
 
 - `setuptools_scm.git` → re-exports from `vcs_versioning._backends._git`
 - `setuptools_scm.hg` → re-exports from `vcs_versioning._backends._hg`
 - `setuptools_scm.version` → re-exports from `vcs_versioning._version_schemes`
-- `setuptools_scm._config` → re-exports from `vcs_versioning.config`
+- `setuptools_scm.integration` → re-exports from `vcs_versioning._integration`
+- `setuptools_scm.discover` → re-exports from `vcs_versioning._discover`
+- `setuptools_scm.fallbacks` → re-exports from `vcs_versioning._fallbacks`
+
+**Note**: Private shims (_config.py, _version_cls.py, _cli.py, _get_version_impl.py) have been removed.
+setuptools_scm/__init__.py now imports directly from vcs_versioning.
 
 ### Utilities
 
@@ -68,3 +73,10 @@ These modules re-export from vcs_versioning for backward compatibility:
 | `setuptools_scm.files_command` | setuptools_scm | stays in setuptools_scm | setuptools_scm only |
 | `setuptools_scm.files_command_fallback` | setuptools_scm | stays in setuptools_scm | setuptools_scm only |
 
+### Console Scripts
+
+| Script | Package | Entry Point |
+|--------|---------|-------------|
+| `setuptools-scm` | setuptools_scm | `vcs_versioning._cli:main` |
+| `vcs-versioning` | vcs_versioning | `vcs_versioning._cli:main` |
+

.wip/progress.md

@@ -46,56 +46,52 @@
   - [x] Update GitHub Actions (if exists)
   - [x] Validate local testing
 
-## Current Status
-
-Phase 1: Completed - Package structure set up
-Phase 2: In progress - Core functionality moved, imports being updated
-
-### Phase 1 Completed
-- ✅ Updated pyproject.toml with dependencies
-- ✅ Added entry points for version_scheme, local_scheme, parse_scm, parse_scm_fallback
-- ✅ Created directory structure (_backends/)
-
-### Phase 2 Progress
-- ✅ Moved utility files (_run_cmd, _node_utils, _modify_version, _types, _entrypoints, _log, _compat, _overrides, _requirement_cls, _version_cls)
-- ✅ Moved VCS backends (git, hg, hg_git) to _backends/
-- ✅ Moved scm_workdir to _backends/
-- ✅ Moved discover
-- ✅ Moved fallbacks (as _fallbacks)
-- ✅ Moved CLI modules
-- ✅ Moved config (as public config.py)
-- ✅ Moved version (as _version_schemes.py)
-- ✅ Created scm_version.py (currently re-exports from _version_schemes)
-- ✅ Moved _get_version_impl
-- ✅ Moved integration utility (_integration.py)
-- ✅ Moved toml utility (_toml.py)
-- ✅ Created _pyproject_reading.py with core functionality
-- ✅ Updated imports in moved files (partially done)
-- ✅ Created public __init__.py with API exports
-
-### Next Steps
-- Fix remaining import errors
-- Test basic imports
-- Commit Phase 1 & 2 work
-
-## Latest Status (October 12, 2025 - Updated)
-
-### ✅ COMPLETED - ALL PHASES
+## Current Status: ✅ ALL PHASES COMPLETE
+
+All phases have been successfully completed and the refactoring is ready for review.
+
+### Recent Updates (Latest Session)
+
+#### Private Shim Removal (Oct 13, 2025)
+- ✅ Removed `_config.py` shim from setuptools_scm (not used internally)
+- ✅ Removed `_version_cls.py` shim from setuptools_scm (not used internally)
+- ✅ Removed `_cli.py` shim from setuptools_scm (not used internally)
+- ✅ Removed `_get_version_impl.py` shim from setuptools_scm (not used internally)
+- ✅ Updated `__init__.py` to import directly from vcs_versioning
+- ✅ Updated console entry points to use `vcs_versioning._cli:main`
+- ✅ Updated test imports to use vcs_versioning modules directly
+- ✅ All tests still pass (408 passing)
+
+#### Config Module Privacy
+- ✅ Renamed `vcs_versioning/config.py` → `vcs_versioning/_config.py`
+- ✅ Configuration class remains public (exported in __all__)
+- ✅ Updated all imports throughout both packages
+
+#### dump_version Migration
+- ✅ Moved dump_version logic to `vcs_versioning/_dump_version.py`
+- ✅ Shared templates between both packages (no branding differences)
+- ✅ setuptools_scm now imports directly from vcs_versioning
+
+## Latest Status (October 13, 2025 - Updated)
+
+### ✅ COMPLETED - ALL PHASES + CLEANUP
 - **Phase 1-2**: Package structure and code movement complete
 - **Phase 3**: Backward compatibility layer complete
   - Circular imports resolved, ScmVersion in _version_schemes
-  - Re-export stubs in setuptools_scm for backward compatibility
+  - Re-export stubs in setuptools_scm for PUBLIC API backward compatibility
+  - **PRIVATE shims removed** (_config.py, _version_cls.py, _cli.py, _get_version_impl.py)
 - **Phase 4**: Public API properly exported
   - vcs_versioning exports Configuration, ScmVersion, Version
-  - setuptools_scm re-exports for backward compatibility
+  - setuptools_scm imports directly from vcs_versioning (no intermediate shims)
 - **Phase 5**: Integration layer rebuilt
   - setuptools_scm depends on vcs-versioning
   - Entry points properly distributed between packages
+  - Console scripts use `vcs_versioning._cli:main`
   - File finders remain in setuptools_scm
 - **Phase 6**: Test migration complete
-  - VCS-agnostic tests moved to vcs-versioning (79 tests)
-  - Integration tests remain in setuptools_scm (329 tests)
-  - All test imports fixed to use correct modules
+  - VCS-agnostic tests moved to vcs-versioning (testingB/)
+  - Integration tests remain in setuptools_scm (testing/)
+  - All test imports use vcs_versioning directly
 - **Phase 7**: Progress tracked with regular commits
 - **Phase 8**: CI/CD ready
   - uv workspace configured
@@ -111,20 +107,24 @@ Phase 2: In progress - Core functionality moved, imports being updated
 
 ### 📦 Build Status
 - `uv sync` successful
-- setuptools-scm: version 9.2.2.dev20+g6e22672.d20251012
+- setuptools-scm: version 9.2.2.dev40+g97b8bdf.d20251013
 - vcs-versioning: version 0.0.1
 - Both packages install and import correctly
+- Minimal indirection: __init__.py imports directly from vcs_versioning
 
 ### 🧪 Test Results - ALL PASSING ✅
-- **vcs-versioning**: 79 passed
-- **setuptools_scm**: 329 passed, 10 skipped, 1 xfailed
-- **Total**: 408 tests passing
-- Test run time: ~15s with parallel execution
+- **Total**: 408 passed, 10 skipped, 1 xfailed
+- Test run time: ~16-17s with parallel execution (`-n12`)
+- Combined test suite: `uv run pytest -n12 testing/ nextgen/vcs-versioning/testingB/`
 
 ### 🔧 Key Fixes Applied
 1. Empty tag regex deprecation warning properly emitted
 2. Test mocks patching actual module locations
 3. Missing backward compat imports (strip_path_suffix, __main__.py)
 4. setuptools.dynamic.version conflict warning
 5. Test patches for _git module vs re-exported git
+6. **Private shim removal**: No unnecessary re-export layers
+7. **Config module privacy**: config.py → _config.py (Configuration is public)
+8. **dump_version migration**: Now in vcs_versioning._dump_version
+9. **Direct imports**: setuptools_scm.__init__ imports from vcs_versioning
 

.wip/summary.md

@@ -25,14 +25,16 @@ All planned phases of the refactoring have been successfully completed. The code
   - `_fallbacks.py` - Fallback version parsing
   - `_cli.py` - CLI implementation
   - `_get_version_impl.py` - Core version logic
+  - `_dump_version.py` - Version file writing (templates and logic)
+  - `_config.py` - Configuration class (private module, Configuration is public)
   - And more utility modules...
 
 **Entry Points**:
 - `setuptools_scm.parse_scm` - VCS parsers
 - `setuptools_scm.parse_scm_fallback` - Fallback parsers
 - `setuptools_scm.local_scheme` - Local version schemes
 - `setuptools_scm.version_scheme` - Version schemes
-- `vcs-versioning` script
+- `vcs-versioning` script → `vcs_versioning._cli:main`
 
 **Tests**: 111 passing (includes backend tests: git, mercurial, hg-git)
 
@@ -44,20 +46,27 @@ All planned phases of the refactoring have been successfully completed. The code
 **Contents**:
 - **Integration modules**:
   - `_integration/setuptools.py` - Setuptools hooks
-  - `_integration/dump_version.py` - Version file writing
   - `_integration/pyproject_reading.py` - Extended with setuptools-specific logic
-  - `_integration/version_inference.py` - Version inference
+  - `_integration/version_inference.py` - Version inference wrapper
 
 - **File finders** (setuptools-specific):
   - `_file_finders/` - Git/Hg file finder implementations
 
-- **Re-export stubs** for backward compatibility:
-  - Most core modules re-export from vcs_versioning
+- **Internal modules**:
+  - `_log.py` - Used by _integration and _file_finders
 
-- **Public API**: Re-exports Configuration, get_version, etc.
+- **Re-export stubs** for backward compatibility (public API):
+  - `git.py`, `hg.py` - Re-export backend functions
+  - `discover.py`, `fallbacks.py` - Re-export discovery/fallback functions
+  - `version.py`, `integration.py` - Re-export version schemes and utilities
+
+- **Public API** (`__init__.py`): Imports directly from vcs_versioning
+  - Configuration, Version, ScmVersion, NonNormalizedVersion
+  - _get_version, get_version, dump_version
+  - DEFAULT_* constants
 
 **Entry Points**:
-- `setuptools_scm` script
+- `setuptools-scm` script → `vcs_versioning._cli:main`
 - `setuptools.finalize_distribution_options` hooks
 - `setuptools_scm.files_command` - File finders
 
@@ -115,6 +124,10 @@ All planned phases of the refactoring have been successfully completed. The code
 3. **Backward compatibility**: Added `__main__.py` shim, fixed imports
 4. **Setuptools conflict warning**: Warns when `tool.setuptools.dynamic.version` conflicts with `setuptools-scm[simple]`
 5. **Module privacy**: Tests import private APIs directly from vcs_versioning
+6. **Private shim removal**: Removed unnecessary re-export shims (_config.py, _version_cls.py, _cli.py, _get_version_impl.py)
+7. **Direct imports**: setuptools_scm/__init__.py imports directly from vcs_versioning
+8. **dump_version migration**: Moved to vcs_versioning._dump_version with shared templates
+9. **Config privacy**: Renamed config.py → _config.py in vcs_versioning (Configuration class is public)
 
 ## Next Steps (Recommended)
 

.wip/test-status.md

@@ -1,48 +1,44 @@
 # Test Suite Status
 
-## Tests to Move to vcs_versioning
-
-- [ ] `test_git.py` - Git backend tests
-- [ ] `test_mercurial.py` - Mercurial backend tests
-- [ ] `test_hg_git.py` - HG-Git backend tests
-- [ ] `test_version.py` - Version scheme tests
-- [ ] `test_config.py` - Configuration tests
-- [ ] `test_cli.py` - CLI tests
-- [ ] `test_functions.py` - Core function tests
-- [ ] `test_overrides.py` - Override tests
-- [ ] `test_basic_api.py` - Basic API tests (parts)
-- [ ] `conftest.py` - Shared fixtures
-- [ ] `wd_wrapper.py` - Test helper
-
-## Tests to Keep in setuptools_scm
-
-- [ ] `test_integration.py` - Setuptools integration
-- [ ] `test_pyproject_reading.py` - Pyproject reading (update imports)
-- [ ] `test_version_inference.py` - Version inference
-- [ ] `test_deprecation.py` - Deprecation warnings
-- [ ] `test_regressions.py` - Regression tests
-- [ ] `test_file_finder.py` - File finder (setuptools-specific)
-- [ ] `test_internal_log_level.py` - Log level tests
-- [ ] `test_main.py` - Main module tests
-- [ ] `test_compat.py` - Compatibility tests
-- [ ] `test_better_root_errors.py` - Error handling
-- [ ] `test_expect_parse.py` - Parse expectations
+## ✅ Tests Moved to vcs_versioning (testingB/)
+
+- [x] `test_git.py` - Git backend tests
+- [x] `test_mercurial.py` - Mercurial backend tests
+- [x] `test_hg_git.py` - HG-Git backend tests
+- [x] `test_version.py` - Version scheme tests
+- [x] `test_config.py` - Configuration tests
+- [x] `test_functions.py` - Core function tests
+- [x] `test_overrides.py` - Override tests
+- [x] `test_basic_api.py` - Basic API tests
+- [x] `conftest.py` - Shared fixtures (via pytest plugin)
+
+## ✅ Tests Kept in setuptools_scm (testing/)
+
+- [x] `test_integration.py` - Setuptools integration
+- [x] `test_pyproject_reading.py` - Pyproject reading
+- [x] `test_version_inference.py` - Version inference
+- [x] `test_deprecation.py` - Deprecation warnings
+- [x] `test_regressions.py` - Regression tests
+- [x] `test_file_finder.py` - File finder (setuptools-specific)
+- [x] `test_internal_log_level.py` - Log level tests
+- [x] `test_main.py` - Main module tests
+- [x] `test_compat.py` - Compatibility tests
+- [x] `test_better_root_errors.py` - Error handling (updated imports)
+- [x] `test_expect_parse.py` - Parse expectations
+- [x] `test_cli.py` - CLI tests (updated imports)
 
 ## Test Execution Status
 
-### vcs_versioning tests
+### Combined test suite
 ```
-Not yet run
-```
-
-### setuptools_scm tests
-```
-Not yet run
+408 passed, 10 skipped, 1 xfailed in 16-17s
 ```
 
 ## Notes
 
-- File finders stay in setuptools_scm (setuptools-specific)
-- Update imports in all tests to use vcs_versioning where appropriate
-- Ensure shared fixtures work for both test suites
+- ✅ File finders stay in setuptools_scm (setuptools-specific)
+- ✅ All test imports updated to use vcs_versioning where appropriate
+- ✅ Shared test fixtures work via `vcs_versioning.test_api` pytest plugin
+- ✅ Test directory renamed to `testingB/` in vcs-versioning to avoid conftest conflicts
+- ✅ Pytest plugin properly configured in both `pyproject.toml` files