From 0923ccc2bba497b694c37c3b623e8baa2f4a0155 Mon Sep 17 00:00:00 2001 From: Aadil Latif Date: Mon, 16 Feb 2026 11:51:36 -0700 Subject: [PATCH 1/3] version bump --- .DS_Store | Bin 8196 -> 10244 bytes .github/workflows/pull_request_tests.yml | 4 ++-- .github/workflows/tests.yml | 2 +- docs/.DS_Store | Bin 0 -> 6148 bytes pyproject.toml | 2 +- src/shift/version.py | 2 +- tests/.DS_Store | Bin 0 -> 6148 bytes tests/test_complete_system_from_location.py | 4 ++-- 8 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 docs/.DS_Store create mode 100644 tests/.DS_Store diff --git a/.DS_Store b/.DS_Store index 7b3c6c149af364180d720a04831e0f6e64af01de..71d2890f5a8b7b18d7982a8f7b879c2e2da8afe0 100644 GIT binary patch literal 10244 zcmeHMPl!`T82@HB>%MJl*@L1K+6ELUvc?2OSVV}saY3jajMPIdY5whQ+T=}4vYX1X z5GXCQdueHVD{ZAvJP2wp9)waa_S%boP9ECcO1l>?3-!-${^ae@4fH$ zee-+2nR&@fh=|QBmD5BCA_{N_JGmXzfFk_j=qn@o&S6-Fcsg0*rDBa2aXs0G_BXr& zUIDLwSHLUa6?hpGz<0JNL0nm1dj-4#UV%sf@qS3)5H_Q2S6TV$KqZ#|urb`01?Tdo zKWswWfX!&zRTg(pm1_>xa#k%1Aewvf)1c)cO-)@SF<9Ce<}>OFwqyU+Ih zdF#^eB2N@s=jCVm8;eHnuVf43J$|%EOH_1NUIoTv>7a|9Rzvf-QEb$zt#&GPmyL|Z z#;Luha{%oZ1k$Sj_NOP<~)?u0kr?keuUW#zx>K$r+&LFy1~g~cE)g&)g|;J(ztn+ zbIq{E!v%Q6Q@j#&SQP^+Bu-7L*xkn70M6{TU5IH2937w%BI@{HNb0MQ=5e(E%tb1| zQ**MdIoZa5ynrla;Aive_?hI1P+#D*jobkN@pE+9u2Z^)zeL8o+ z%wh7|xOL={f0Ra1tjTYX-{QCSrQjE*cjzR|(g`|EIn+ta(2w0OjuG)5FxkF_nSD{t zZcZO!l$8)ABE>9sX7b1#Cw79)pq=BCrBkxKI+bm0MrWOfQS@7rN)GD!V3eibwkzKQ zrQ=QY=8}!x8#MB6j`Du5rCdCPqW z7o(QU9v+M^nX+To1XEwU0$u^HfLFjP;1$@y3XG~}ONjmd6T|=i-@*#`NAn7J1z0Sb z%g#WD-VT&2iP&pT;P?QCC<512R)(OG+wrh+J02HeJN|7P0xQ=)`aGj;S6LYjj0}f; eQGW(lyA9?VNdJ8it?|tj82RF(;@o@}m!zEhB#@2M1PfSv4;*tul}|yJpDZON#l-kvvYFT;X2$&QlcmLj znV1457l^y6GBBtw0P1FCC}ButC_3Npw>aKY+OidAysg2rIqB0Scpp1oe40D9nS#whGmMx%h zd-SN?>sITnq(8`ctKly)z|U@t4yZ{ZI;Gj?cXL&lUGFDx-0USy*h}YcmyP%P*WJ8N zd#TUhB=eq(Ew-Qyx}XjnLmAJgg>e|ZPuow6{IYpXu3sKLC9k=A_LJ}YmiY#G8jIs; z6I= zWk4C2GQi&l3uTNvrh@L%fx)!^z#_~}Fy~%^W30!>V=9Ohh>=jBgc{#s7zu~ndcVkH zDk$M(eDh)a$;Njm#+{D+t#c<63F@c}C<7q_D{@)p`oFih{||%oN*PcF{uKkJ7}w(( zZpqiy+|6;Vwa`N-3;U&l(-2HtDTXhX;vJ|H*ey?hk;haJ7Kr``I2v?N27Z-+FVA&$ ARsaA1 literal 0 HcmV?d00001 diff --git a/pyproject.toml b/pyproject.toml index 2bb5ee6..de0fe66 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,7 +29,7 @@ dependencies = [ "scikit-learn", "plotly", "geopy", - "grid-data-models==2.2.1", + "grid-data-models==2.3.0", "importlib-metadata", "loguru", ] diff --git a/src/shift/version.py b/src/shift/version.py index b4f04f0..c580ec5 100644 --- a/src/shift/version.py +++ b/src/shift/version.py @@ -3,7 +3,7 @@ import platform import sys -VERSION = "0.6.2" +VERSION = "0.6.3" def is_git_repo(dir: Path) -> bool: diff --git a/tests/.DS_Store b/tests/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..a6b48682e37a9211650fd4433bf9e04f639c6a3b GIT binary patch literal 6148 zcmeHKF;2rU6#XUvMJb(+e~JSGRmosQ)Wa{m!)d$^Lk4CF1KrMcJOk4%iP|@%o#0; zae1g#7emk{&A?#_pMX&c1rvM?XhJ9KU1sEMoG;ICxz>WSizlPwl6kUx&i?CJ?s~|3 z;Pr_8F9mRCvjug7;za>bKoodWfX{~zg)y>N7}Q4xoPGiTeKc!By}=b=Xfd)_7(@?D znN*-jRrZOYOgh>_8y8tD44QOO_VJ Date: Mon, 16 Feb 2026 15:28:48 -0700 Subject: [PATCH 2/3] Update project URLs, contacts and CI config Replace references to the old organization/name and contact emails across repository metadata and docs (NREL-Distribution-Suites -> NLR-Distribution-Suite; nrel.gov -> nlr.gov). Update GitHub issue/discussion templates, CONTRIBUTING, README, QUICKSTART, docs, and pyproject.toml links and author emails accordingly. Also bump Codecov action to v5 and adjust the test matrix Python version from 3.11 to 3.12; add workflow badges to the README. --- .github/ISSUE_TEMPLATE/bug.yml | 4 ++-- .github/ISSUE_TEMPLATE/config.yml | 2 +- .github/ISSUE_TEMPLATE/feature.yml | 2 +- .github/workflows/tests.yml | 4 ++-- CONTRIBUTING.md | 4 ++-- QUICKSTART.md | 2 +- README.md | 20 +++++++++++--------- docs/index.md | 2 +- docs/usage/building_system.md | 2 +- pyproject.toml | 12 ++++++------ 10 files changed, 28 insertions(+), 26 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index 777fd6e..363b3ef 100644 --- a/.github/ISSUE_TEMPLATE/bug.yml +++ b/.github/ISSUE_TEMPLATE/bug.yml @@ -16,11 +16,11 @@ body: options: - label: I have searched existing issues for a duplicate issue and I'm sure this is new. required: True - - label: I have read and followed [the docs](https://nrel-distribution-suites.github.io/shift) and still think this is a bug. + - label: I have read and followed [the docs](https://nlr-distribution-suite.github.io/shift) and still think this is a bug. required: True - label: > I am certain that this is an issue with shift - (not my code or another library such as [grid-data-models](https://github.com/NREL-Distribution-Suites/grid-data-models)) + (not my code or another library such as [grid-data-models](https://github.com/NLR-Distribution-Suite/grid-data-models)) required: True - type: textarea diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index ab39d52..6e3bb05 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,5 +1,5 @@ blank_issues_enabled: true contact_links: - name: 🤔 Ask a Question - url: "https://github.com/NREL-Distribution-Suites/shift/discussions/new?category=question" + url: "https://github.com/NLR-Distribution-Suite/shift/discussions/new?category=question" about: Ask a question about how to use shift using github discussions diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/feature.yml index d8d5138..a3ff6a8 100644 --- a/.github/ISSUE_TEMPLATE/feature.yml +++ b/.github/ISSUE_TEMPLATE/feature.yml @@ -16,7 +16,7 @@ body: options: - label: I have searched existing issues for a duplicate feature request and I'm sure this is new. required: True - - label: I have read and followed [the docs](https://nrel-distribution-suites.github.io/shift) and still think this is missing. + - label: I have read and followed [the docs](https://nlr-distribution-suite.github.io/shift) and still think this is missing. required: True - type: textarea diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8adb351..1dc2b3b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -41,8 +41,8 @@ jobs: pytest --cov=shift --cov-report=xml --cov-report=term - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3 - if: matrix.os == 'ubuntu-latest' && matrix.python-version == '3.11' + uses: codecov/codecov-action@v5 + if: matrix.os == 'ubuntu-latest' && matrix.python-version == '3.12' with: file: ./coverage.xml flags: unittests diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index dedebc6..aa7aa77 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -278,8 +278,8 @@ Include: ## Questions and Support -- **Issues**: Use [GitHub Issues](https://github.com/NREL-Distribution-Suites/shift/issues) for bugs and feature requests -- **Discussions**: Use [GitHub Discussions](https://github.com/NREL-Distribution-Suites/shift/discussions) for questions +- **Issues**: Use [GitHub Issues](https://github.com/NLR-Distribution-Suite/shift/issues) for bugs and feature requests +- **Discussions**: Use [GitHub Discussions](https://github.com/NLR-Distribution-Suite/shift/discussions) for questions - **Email**: Contact maintainers for sensitive issues ## License diff --git a/QUICKSTART.md b/QUICKSTART.md index 4ba2d98..b64a46f 100644 --- a/QUICKSTART.md +++ b/QUICKSTART.md @@ -7,7 +7,7 @@ Get a development environment running in under five minutes. ### 1. Clone and Install ```bash -git clone https://github.com/NREL-Distribution-Suites/shift.git +git clone https://github.com/NLR-Distribution-Suite/shift.git cd shift python -m venv venv diff --git a/README.md b/README.md index 026f7fa..e4df0f2 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ +![Tests](https://github.com/NLR-Distribution-Suite/shift/actions/workflows/tests.yml/badge.svg) • ![PR Tests](https://github.com/NLR-Distribution-Suite/shift/actions/workflows/pull_request_tests.yml/badge.svg) • ![Docs](https://github.com/NLR-Distribution-Suite/shift/actions/workflows/gh-pages.yml/badge.svg) • ![Publish](https://github.com/NLR-Distribution-Suite/shift/actions/workflows/publish.yml/badge.svg) • ![PyPI Downloads](https://img.shields.io/pypi/dm/nrel-shift) • ![License](https://img.shields.io/github/license/NLR-Distribution-Suite/shift) • ![Issues](https://img.shields.io/github/issues/NLR-Distribution-Suite/shift) • ![CodeFactor](https://www.codefactor.io/repository/github/NLR-Distribution-Suite/shift/badge) • ![Codecov](https://img.shields.io/codecov/c/github/NLR-Distribution-Suite/shift) • ![MCP Server](https://img.shields.io/badge/MCP_Server-enabled-brightgreen) • ![MCP Tools](https://img.shields.io/badge/MCP_Tools-33-blue) + # NREL-shift -A Python framework for building synthetic power distribution feeder models from open-source geospatial data. NREL-shift fetches building parcels and road networks from OpenStreetMap, constructs graph-based network topologies, and exports simulator-ready models through [Grid Data Models](https://github.com/NREL-Distribution-Suites/grid-data-models) and [Ditto](https://github.com/NREL-Distribution-Suites/ditto). +A Python framework for building synthetic power distribution feeder models from open-source geospatial data. NREL-shift fetches building parcels and road networks from OpenStreetMap, constructs graph-based network topologies, and exports simulator-ready models through [Grid Data Models](https://github.com/NLR-Distribution-Suite/grid-data-models) and [Ditto](https://github.com/NLR-Distribution-Suite/ditto). ## Features @@ -23,7 +25,7 @@ pip install nrel-shift ### From Source ```bash -git clone https://github.com/NREL-Distribution-Suites/shift.git +git clone https://github.com/NLR-Distribution-Suite/shift.git cd shift pip install -e . ``` @@ -192,7 +194,7 @@ pytest -m "not slow" # Skip slow tests - Python >= 3.10 - [OSMnx](https://osmnx.readthedocs.io/) — OpenStreetMap data access - [NetworkX](https://networkx.org/) — Graph operations -- [Grid Data Models](https://github.com/NREL-Distribution-Suites/grid-data-models) — Power system component models +- [Grid Data Models](https://github.com/NLR-Distribution-Suite/grid-data-models) — Power system component models - See [pyproject.toml](./pyproject.toml) for the complete dependency list ## License @@ -201,9 +203,9 @@ BSD-3-Clause — see [LICENSE.txt](./LICENSE.txt). ## Authors -- Kapil Duwadi (Kapil.Duwadi@nrel.gov) -- Aadil Latif (Aadil.Latif@nrel.gov) -- Erik Pohl (Erik.Pohl@nrel.gov) +- Kapil Duwadi (Kapil.Duwadi@nlr.gov) +- Aadil Latif (Aadil.Latif@nlr.gov) +- Erik Pohl (Erik.Pohl@nlr.gov) ## Citation @@ -212,11 +214,11 @@ BSD-3-Clause — see [LICENSE.txt](./LICENSE.txt). title = {NREL-shift: Framework for Developing Synthetic Distribution Feeder Models}, author = {Duwadi, Kapil and Latif, Aadil and Pohl, Erik}, year = {2026}, - url = {https://github.com/NREL-Distribution-Suites/shift} + url = {https://github.com/NLR-Distribution-Suite/shift} } ``` ## Support -- [Open an issue](https://github.com/NREL-Distribution-Suites/shift/issues) for bugs and feature requests -- [Discussions](https://github.com/NREL-Distribution-Suites/shift/discussions) for questions \ No newline at end of file +- [Open an issue](https://github.com/NLR-Distribution-Suite/shift/issues) for bugs and feature requests +- [Discussions](https://github.com/NLR-Distribution-Suite/shift/discussions) for questions \ No newline at end of file diff --git a/docs/index.md b/docs/index.md index 0373af1..627a428 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,6 +1,6 @@ # NREL-shift -A Python framework for building synthetic power distribution feeder models from open-source geospatial data. NREL-shift fetches building parcels and road networks from OpenStreetMap, constructs graph-based network topologies, and exports simulator-ready models via [Grid Data Models](https://github.com/NREL-Distribution-Suites/grid-data-models). +A Python framework for building synthetic power distribution feeder models from open-source geospatial data. NREL-shift fetches building parcels and road networks from OpenStreetMap, constructs graph-based network topologies, and exports simulator-ready models via [Grid Data Models](https://github.com/NLR-Distribution-Suite/grid-data-models). ## Installation diff --git a/docs/usage/building_system.md b/docs/usage/building_system.md index d294fde..6dc0a45 100644 --- a/docs/usage/building_system.md +++ b/docs/usage/building_system.md @@ -34,7 +34,7 @@ system.to_json(output_folder / "fort_worth_feeder.json") ## Export to a Simulator -The `DistributionSystem` object is compatible with [Ditto](https://github.com/NREL-Distribution-Suites/ditto) writers for exporting to OpenDSS, CYME, Synergi, and other simulators: +The `DistributionSystem` object is compatible with [Ditto](https://github.com/NLR-Distribution-Suite/ditto) writers for exporting to OpenDSS, CYME, Synergi, and other simulators: ```python # Example (requires the Ditto package) diff --git a/pyproject.toml b/pyproject.toml index de0fe66..9b707de 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,9 +15,9 @@ requires-python = ">=3.10" license = "BSD-3-clause" keywords = [] authors = [ - { name = "Kapil Duwadi", email = "Kapil.Duwadi@nrel.gov" }, - { name = "Aadil Latif", email = "Aadil.Latif@nrel.gov" }, - { name = "Erik Pohl", email = "Erik.Pohl@nrel.gov" }, + { name = "Kapil Duwadi", email = "Kapil.Duwadi@nlr.gov" }, + { name = "Aadil Latif", email = "Aadil.Latif@nlr.gov" }, + { name = "Erik Pohl", email = "Erik.Pohl@nlr.gov" }, ] classifiers = [ "Programming Language :: Python :: 3.11", @@ -43,9 +43,9 @@ mcp = ["mcp[cli]>=1.2.0", "pyyaml"] shift-mcp-server = "shift.mcp_server.__main__:main" [project.urls] -Documentation = "https://github.com/NREL-Distribution-Suites/shift#readme" -Issues = "https://github.com/NREL-Distribution-Suites/shift/issues" -Source = "https://github.com/NREL-Distribution-Suites/shift" +Documentation = "https://github.com/NLR-Distribution-Suite/shift#readme" +Issues = "https://github.com/NLR-Distribution-Suite/shift/issues" +Source = "https://github.com/NLR-Distribution-Suite/shift" [tool.ruff] # Exclude a variety of commonly ignored directories. From 4d85f900f0c38f042e36b949711c7b96ccee8a45 Mon Sep 17 00:00:00 2001 From: Aadil Latif Date: Mon, 16 Feb 2026 15:30:50 -0700 Subject: [PATCH 3/3] a --- .github/workflows/pull_request_tests.yml | 2 +- .github/workflows/tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull_request_tests.yml b/.github/workflows/pull_request_tests.yml index c92ec77..26aa921 100644 --- a/.github/workflows/pull_request_tests.yml +++ b/.github/workflows/pull_request_tests.yml @@ -18,7 +18,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - python -m pip install ".[dev]" + python -m pip install ".[dev,mcp]" - name: Run pytest run: | python -m pytest -v --disable-warnings tests diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1dc2b3b..b0407c8 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -26,7 +26,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install -e ".[dev]" + pip install -e ".[dev,mcp]" - name: Run linter run: |