diff --git a/packages/dfo-data-tools/pyproject.toml b/packages/dfo-data-tools/pyproject.toml index 3508f332..c8a4a941 100644 --- a/packages/dfo-data-tools/pyproject.toml +++ b/packages/dfo-data-tools/pyproject.toml @@ -88,10 +88,10 @@ graph-release = ["google-cloud-spanner>=3.57", "dfo-data-tools[coverage]"] [tool.uv.sources] # See the root pyproject.toml's dfo-spec-kit source comment for the # pin-consistency invariant this rev must satisfy. -dfo-spec-kit-frame-grammar = { git = "https://github.com/DevelopmentFinanceObservatory/spec-kit.git", rev = "0d19172e3695c311ed48ff43a885a9995869e6a5", subdirectory = "python/frame-grammar" } -dfo-spec-kit-components = { git = "https://github.com/DevelopmentFinanceObservatory/spec-kit.git", rev = "0d19172e3695c311ed48ff43a885a9995869e6a5", subdirectory = "python/dfo-spec-kit-components" } -dfo-spec-kit-provenance-docs = { git = "https://github.com/DevelopmentFinanceObservatory/spec-kit.git", rev = "0d19172e3695c311ed48ff43a885a9995869e6a5", subdirectory = "python/provenance-docs" } -dfo-spec-kit-descriptions = { git = "https://github.com/DevelopmentFinanceObservatory/spec-kit.git", rev = "0d19172e3695c311ed48ff43a885a9995869e6a5", subdirectory = "python/descriptions" } +dfo-spec-kit-frame-grammar = { git = "https://github.com/DevelopmentFinanceObservatory/spec-kit.git", rev = "98e53ee2fb400694ebf9e48ecf8f9af25ca2e684", subdirectory = "python/frame-grammar" } +dfo-spec-kit-components = { git = "https://github.com/DevelopmentFinanceObservatory/spec-kit.git", rev = "98e53ee2fb400694ebf9e48ecf8f9af25ca2e684", subdirectory = "python/dfo-spec-kit-components" } +dfo-spec-kit-provenance-docs = { git = "https://github.com/DevelopmentFinanceObservatory/spec-kit.git", rev = "98e53ee2fb400694ebf9e48ecf8f9af25ca2e684", subdirectory = "python/provenance-docs" } +dfo-spec-kit-descriptions = { git = "https://github.com/DevelopmentFinanceObservatory/spec-kit.git", rev = "98e53ee2fb400694ebf9e48ecf8f9af25ca2e684", subdirectory = "python/descriptions" } [build-system] requires = ["uv_build>=0.11,<0.12"] diff --git a/pyproject.toml b/pyproject.toml index b44cf731..95508d46 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -241,7 +241,7 @@ dfo-data-tools = { workspace = true } # The registry refuses a part's `source_code` on search.resolve with # `source_code_not_held`, `source_code_ambiguous`, and # `source_code_shares_variable`. -# The pin is 0d19172 on spec-kit's dev branch. It registers +# The pin is 98e53ee on spec-kit's dev branch. It registers # slot_default_not_applied, the three source-code refusals and # whole_total_available, retires starved_axis_binding_restored, and holds the # client contract `dfo-spec-kit-client-contract` reads, whose ref format admits @@ -251,8 +251,8 @@ dfo-data-tools = { workspace = true } # refuses a 202 that reads `done`. # Follow-up: move all six to a real spec-kit tag once one is cut, so a future # force-push or GC on spec-kit's dev can't silently break this lock. -dfo-spec-kit = { git = "https://github.com/DevelopmentFinanceObservatory/spec-kit.git", rev = "0d19172e3695c311ed48ff43a885a9995869e6a5", subdirectory = "python/spec-kit" } -dfo-spec-kit-client-contract = { git = "https://github.com/DevelopmentFinanceObservatory/spec-kit.git", rev = "0d19172e3695c311ed48ff43a885a9995869e6a5", subdirectory = "python/client-contract" } +dfo-spec-kit = { git = "https://github.com/DevelopmentFinanceObservatory/spec-kit.git", rev = "98e53ee2fb400694ebf9e48ecf8f9af25ca2e684", subdirectory = "python/spec-kit" } +dfo-spec-kit-client-contract = { git = "https://github.com/DevelopmentFinanceObservatory/spec-kit.git", rev = "98e53ee2fb400694ebf9e48ecf8f9af25ca2e684", subdirectory = "python/client-contract" } [tool.pytest.ini_options] testpaths = ["tests"] diff --git a/uv.lock b/uv.lock index 9770cabf..eaaebca3 100644 --- a/uv.lock +++ b/uv.lock @@ -724,10 +724,10 @@ requires-dist = [ { name = "dfo-data-tools", extras = ["generation"], marker = "extra == 'resolve'", editable = "packages/dfo-data-tools" }, { name = "dfo-data-tools", extras = ["sdmx"], marker = "extra == 'coverage'", editable = "packages/dfo-data-tools" }, { name = "dfo-data-tools", extras = ["sdmx"], marker = "extra == 'formats'", editable = "packages/dfo-data-tools" }, - { name = "dfo-spec-kit-components", git = "https://github.com/DevelopmentFinanceObservatory/spec-kit.git?subdirectory=python%2Fdfo-spec-kit-components&rev=0d19172e3695c311ed48ff43a885a9995869e6a5" }, - { name = "dfo-spec-kit-descriptions", git = "https://github.com/DevelopmentFinanceObservatory/spec-kit.git?subdirectory=python%2Fdescriptions&rev=0d19172e3695c311ed48ff43a885a9995869e6a5" }, - { name = "dfo-spec-kit-frame-grammar", extras = ["arrow"], git = "https://github.com/DevelopmentFinanceObservatory/spec-kit.git?subdirectory=python%2Fframe-grammar&rev=0d19172e3695c311ed48ff43a885a9995869e6a5" }, - { name = "dfo-spec-kit-provenance-docs", git = "https://github.com/DevelopmentFinanceObservatory/spec-kit.git?subdirectory=python%2Fprovenance-docs&rev=0d19172e3695c311ed48ff43a885a9995869e6a5" }, + { name = "dfo-spec-kit-components", git = "https://github.com/DevelopmentFinanceObservatory/spec-kit.git?subdirectory=python%2Fdfo-spec-kit-components&rev=98e53ee2fb400694ebf9e48ecf8f9af25ca2e684" }, + { name = "dfo-spec-kit-descriptions", git = "https://github.com/DevelopmentFinanceObservatory/spec-kit.git?subdirectory=python%2Fdescriptions&rev=98e53ee2fb400694ebf9e48ecf8f9af25ca2e684" }, + { name = "dfo-spec-kit-frame-grammar", extras = ["arrow"], git = "https://github.com/DevelopmentFinanceObservatory/spec-kit.git?subdirectory=python%2Fframe-grammar&rev=98e53ee2fb400694ebf9e48ecf8f9af25ca2e684" }, + { name = "dfo-spec-kit-provenance-docs", git = "https://github.com/DevelopmentFinanceObservatory/spec-kit.git?subdirectory=python%2Fprovenance-docs&rev=98e53ee2fb400694ebf9e48ecf8f9af25ca2e684" }, { name = "fastapi", marker = "extra == 'surface'", specifier = ">=0.138" }, { name = "google-auth", extras = ["requests"], marker = "extra == 'generation'", specifier = ">=2.55" }, { name = "google-auth", extras = ["requests"], marker = "extra == 'sdmx'", specifier = ">=2.55" }, @@ -753,7 +753,7 @@ provides-extras = ["sdmx", "formats", "surface", "resolve", "generation", "cover [[package]] name = "dfo-spec-kit" version = "0.2.0" -source = { git = "https://github.com/DevelopmentFinanceObservatory/spec-kit.git?subdirectory=python%2Fspec-kit&rev=0d19172e3695c311ed48ff43a885a9995869e6a5#0d19172e3695c311ed48ff43a885a9995869e6a5" } +source = { git = "https://github.com/DevelopmentFinanceObservatory/spec-kit.git?subdirectory=python%2Fspec-kit&rev=98e53ee2fb400694ebf9e48ecf8f9af25ca2e684#98e53ee2fb400694ebf9e48ecf8f9af25ca2e684" } dependencies = [ { name = "rfc8785" }, ] @@ -761,12 +761,12 @@ dependencies = [ [[package]] name = "dfo-spec-kit-client-contract" version = "0.1.0" -source = { git = "https://github.com/DevelopmentFinanceObservatory/spec-kit.git?subdirectory=python%2Fclient-contract&rev=0d19172e3695c311ed48ff43a885a9995869e6a5#0d19172e3695c311ed48ff43a885a9995869e6a5" } +source = { git = "https://github.com/DevelopmentFinanceObservatory/spec-kit.git?subdirectory=python%2Fclient-contract&rev=98e53ee2fb400694ebf9e48ecf8f9af25ca2e684#98e53ee2fb400694ebf9e48ecf8f9af25ca2e684" } [[package]] name = "dfo-spec-kit-components" version = "0.1.0" -source = { git = "https://github.com/DevelopmentFinanceObservatory/spec-kit.git?subdirectory=python%2Fdfo-spec-kit-components&rev=0d19172e3695c311ed48ff43a885a9995869e6a5#0d19172e3695c311ed48ff43a885a9995869e6a5" } +source = { git = "https://github.com/DevelopmentFinanceObservatory/spec-kit.git?subdirectory=python%2Fdfo-spec-kit-components&rev=98e53ee2fb400694ebf9e48ecf8f9af25ca2e684#98e53ee2fb400694ebf9e48ecf8f9af25ca2e684" } dependencies = [ { name = "dfo-spec-kit-descriptions" }, ] @@ -774,7 +774,7 @@ dependencies = [ [[package]] name = "dfo-spec-kit-descriptions" version = "0.1.0" -source = { git = "https://github.com/DevelopmentFinanceObservatory/spec-kit.git?subdirectory=python%2Fdescriptions&rev=0d19172e3695c311ed48ff43a885a9995869e6a5#0d19172e3695c311ed48ff43a885a9995869e6a5" } +source = { git = "https://github.com/DevelopmentFinanceObservatory/spec-kit.git?subdirectory=python%2Fdescriptions&rev=98e53ee2fb400694ebf9e48ecf8f9af25ca2e684#98e53ee2fb400694ebf9e48ecf8f9af25ca2e684" } dependencies = [ { name = "rfc8785" }, ] @@ -782,7 +782,7 @@ dependencies = [ [[package]] name = "dfo-spec-kit-frame-grammar" version = "0.1.0" -source = { git = "https://github.com/DevelopmentFinanceObservatory/spec-kit.git?subdirectory=python%2Fframe-grammar&rev=0d19172e3695c311ed48ff43a885a9995869e6a5#0d19172e3695c311ed48ff43a885a9995869e6a5" } +source = { git = "https://github.com/DevelopmentFinanceObservatory/spec-kit.git?subdirectory=python%2Fframe-grammar&rev=98e53ee2fb400694ebf9e48ecf8f9af25ca2e684#98e53ee2fb400694ebf9e48ecf8f9af25ca2e684" } dependencies = [ { name = "dfo-spec-kit" }, { name = "pyarrow" }, @@ -792,7 +792,7 @@ dependencies = [ [[package]] name = "dfo-spec-kit-provenance-docs" version = "0.1.0" -source = { git = "https://github.com/DevelopmentFinanceObservatory/spec-kit.git?subdirectory=python%2Fprovenance-docs&rev=0d19172e3695c311ed48ff43a885a9995869e6a5#0d19172e3695c311ed48ff43a885a9995869e6a5" } +source = { git = "https://github.com/DevelopmentFinanceObservatory/spec-kit.git?subdirectory=python%2Fprovenance-docs&rev=98e53ee2fb400694ebf9e48ecf8f9af25ca2e684#98e53ee2fb400694ebf9e48ecf8f9af25ca2e684" } dependencies = [ { name = "markdown-it-py" }, ] @@ -2938,7 +2938,7 @@ requires-dist = [ { name = "dfo-data-tools", extras = ["resolve", "sdmx", "coverage"], marker = "extra == 'graph'", editable = "packages/dfo-data-tools" }, { name = "dfo-data-tools", extras = ["sdmx"], marker = "extra == 'sdmx'", editable = "packages/dfo-data-tools" }, { name = "dfo-data-tools", extras = ["surface", "resolve", "coverage", "sdmx"], marker = "extra == 'engine'", editable = "packages/dfo-data-tools" }, - { name = "dfo-spec-kit", marker = "extra == 'engine'", git = "https://github.com/DevelopmentFinanceObservatory/spec-kit.git?subdirectory=python%2Fspec-kit&rev=0d19172e3695c311ed48ff43a885a9995869e6a5" }, + { name = "dfo-spec-kit", marker = "extra == 'engine'", git = "https://github.com/DevelopmentFinanceObservatory/spec-kit.git?subdirectory=python%2Fspec-kit&rev=98e53ee2fb400694ebf9e48ecf8f9af25ca2e684" }, { name = "fastapi", marker = "extra == 'api'", specifier = ">=0.138" }, { name = "google-auth", marker = "extra == 'datasets'", specifier = ">=2.34" }, { name = "google-auth", extras = ["requests"], marker = "extra == 'eval'", specifier = ">=2.34" }, @@ -2969,7 +2969,7 @@ lint = [ { name = "ruff", specifier = ">=0.15" }, ] test = [ - { name = "dfo-spec-kit-client-contract", git = "https://github.com/DevelopmentFinanceObservatory/spec-kit.git?subdirectory=python%2Fclient-contract&rev=0d19172e3695c311ed48ff43a885a9995869e6a5" }, + { name = "dfo-spec-kit-client-contract", git = "https://github.com/DevelopmentFinanceObservatory/spec-kit.git?subdirectory=python%2Fclient-contract&rev=98e53ee2fb400694ebf9e48ecf8f9af25ca2e684" }, { name = "frictionless", specifier = ">=5.19.0" }, { name = "pytest", specifier = ">=8" }, { name = "pytest-split", specifier = ">=0.10.0" },