From a6c908d0c53e04c0e90bf70f8868c26c5494f256 Mon Sep 17 00:00:00 2001 From: wpbonelli Date: Mon, 3 Mar 2025 16:45:33 -0500 Subject: [PATCH] chore: rename (#64) --- .github/workflows/ci.yml | 8 ++++---- .github/workflows/release.yml | 2 +- .gitignore | 5 ++++- CITATION.cff | 2 +- HISTORY.md | 30 +++++++++++++++--------------- README.md | 6 +++--- autotest/conftest.py | 4 ++-- cliff.toml | 2 +- pyproject.toml | 2 +- 9 files changed, 32 insertions(+), 29 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2c75fa3..f1f5ea7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -109,7 +109,7 @@ jobs: run: | python -m pip install --upgrade pip pip install git+https://git@github.com/Deltares/xmipy@develop - pip install git+https://git@github.com/MODFLOW-USGS/modflow-devtools@develop + pip install git+https://git@github.com/MODFLOW-ORG/modflow-devtools@develop pip install .[test] - name: Install modflow executables @@ -150,7 +150,7 @@ jobs: run: | python -m pip install --upgrade pip pip install git+https://git@github.com/Deltares/xmipy@develop - pip install git+https://git@github.com/MODFLOW-USGS/modflow-devtools@develop + pip install git+https://git@github.com/MODFLOW-ORG/modflow-devtools@develop pip install .[test] - name: Install modflow executables @@ -184,7 +184,7 @@ jobs: - name: Checkout mf6-examples uses: actions/checkout@v4 with: - repository: MODFLOW-USGS/modflow6-examples + repository: MODFLOW-ORG/modflow6-examples path: modflow6-examples - name: Setup Python @@ -198,7 +198,7 @@ jobs: run: | python -m pip install --upgrade pip pip install git+https://git@github.com/Deltares/xmipy@develop - pip install git+https://git@github.com/MODFLOW-USGS/modflow-devtools@develop + pip install git+https://git@github.com/MODFLOW-ORG/modflow-devtools@develop pip install git+https://git@github.com/modflowpy/flopy@develop pip install .[test] diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cf17652..6829c41 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -167,7 +167,7 @@ jobs: publish: name: Publish package # runs only after release is published (manually promoted from draft) - if: github.event_name == 'release' && github.repository_owner == 'MODFLOW-USGS' + if: github.event_name == 'release' && github.repository_owner == 'MODFLOW-ORG' runs-on: ubuntu-22.04 permissions: contents: write diff --git a/.gitignore b/.gitignore index 6a6e2e1..36d195c 100644 --- a/.gitignore +++ b/.gitignore @@ -134,4 +134,7 @@ dmypy.json # library files **.dll **.so -**.dylib \ No newline at end of file +**.dylib + +# uv lockfile +uv.lock \ No newline at end of file diff --git a/CITATION.cff b/CITATION.cff index e4533c8..2bfaabf 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -7,7 +7,7 @@ version: 0.3.0.dev0 date-released: '2023-04-19' abstract: An extension to xmipy for the MODFLOW API. repository-artifact: https://pypi.org/project/modflowapi -repository-code: https://github.com/MODFLOW-USGS/modflowapi +repository-code: https://github.com/MODFLOW-ORG/modflowapi license: CC0-1.0 authors: - family-names: Hughes diff --git a/HISTORY.md b/HISTORY.md index b774f65..ea77686 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -3,19 +3,19 @@ #### Refactoring -* [refactor(rhs, hcof)](https://github.com/MODFLOW-USGS/modflowapi/commit/c0f681c5b7525388ead4df8c6363c1b4514d6de6): Updates to allow setting values when rhs and hcof have not yet had pointers set.. Committed by Joshua Larsen on 2023-04-28. -* [refactor(Quickstart.ipynb)](https://github.com/MODFLOW-USGS/modflowapi/commit/3b6675aa687f5af01813abfdb143c7ddd4343646): Fix error in callback_function. Committed by Joshua Larsen on 2023-07-17. -* [refactor(rhs, hcof)](https://github.com/MODFLOW-USGS/modflowapi/commit/ce4e50286d66da51c6b05f0de29c7c646344f6ce): Allow setting rhs and hcof when pointers have not been previously set. Committed by Joshua Larsen on 2023-07-17. -* [refactor](https://github.com/MODFLOW-USGS/modflowapi/commit/e693282611d5863bafeece362230a4aadd02311f): Update libmf6 path handling (#27). Committed by w-bonelli on 2023-08-03. -* [refactor(_ptr_to_recarray)](https://github.com/MODFLOW-USGS/modflowapi/commit/5a631592f2da57bf1564c263e9602c46e5a5a50c): Slice pointers prior to setting data to recarray. Committed by Joshua Larsen on 2023-08-08. -* [refactor(_ptr_to_recarray)](https://github.com/MODFLOW-USGS/modflowapi/commit/959fe31abda263a52d01262af7dc4c2a878eadb5): Slice pointers prior to setting data to recarray. Committed by Joshua Larsen on 2023-08-08. -* [refactor(extensions)](https://github.com/MODFLOW-USGS/modflowapi/commit/c97339d06e7386055e486f6354825ec15cea4638): Add support for IDM changes. Committed by Joshua Larsen on 2023-12-21. -* [refactor(extensions)](https://github.com/MODFLOW-USGS/modflowapi/commit/de0aff9c21d5d925235f306fd2b3d148c3281efa): Add support for IDM changes. Committed by Joshua Larsen on 2023-12-21. +* [refactor(rhs, hcof)](https://github.com/MODFLOW-ORG/modflowapi/commit/c0f681c5b7525388ead4df8c6363c1b4514d6de6): Updates to allow setting values when rhs and hcof have not yet had pointers set.. Committed by Joshua Larsen on 2023-04-28. +* [refactor(Quickstart.ipynb)](https://github.com/MODFLOW-ORG/modflowapi/commit/3b6675aa687f5af01813abfdb143c7ddd4343646): Fix error in callback_function. Committed by Joshua Larsen on 2023-07-17. +* [refactor(rhs, hcof)](https://github.com/MODFLOW-ORG/modflowapi/commit/ce4e50286d66da51c6b05f0de29c7c646344f6ce): Allow setting rhs and hcof when pointers have not been previously set. Committed by Joshua Larsen on 2023-07-17. +* [refactor](https://github.com/MODFLOW-ORG/modflowapi/commit/e693282611d5863bafeece362230a4aadd02311f): Update libmf6 path handling (#27). Committed by w-bonelli on 2023-08-03. +* [refactor(_ptr_to_recarray)](https://github.com/MODFLOW-ORG/modflowapi/commit/5a631592f2da57bf1564c263e9602c46e5a5a50c): Slice pointers prior to setting data to recarray. Committed by Joshua Larsen on 2023-08-08. +* [refactor(_ptr_to_recarray)](https://github.com/MODFLOW-ORG/modflowapi/commit/959fe31abda263a52d01262af7dc4c2a878eadb5): Slice pointers prior to setting data to recarray. Committed by Joshua Larsen on 2023-08-08. +* [refactor(extensions)](https://github.com/MODFLOW-ORG/modflowapi/commit/c97339d06e7386055e486f6354825ec15cea4638): Add support for IDM changes. Committed by Joshua Larsen on 2023-12-21. +* [refactor(extensions)](https://github.com/MODFLOW-ORG/modflowapi/commit/de0aff9c21d5d925235f306fd2b3d148c3281efa): Add support for IDM changes. Committed by Joshua Larsen on 2023-12-21. ### Version 0.1.0 -* Fix typo in README (https://github.com/MODFLOW-USGS/modflowapi/pull/4) -* modflowapi interface (https://github.com/MODFLOW-USGS/modflowapi/pull/8) +* Fix typo in README (https://github.com/MODFLOW-ORG/modflowapi/pull/4) +* modflowapi interface (https://github.com/MODFLOW-ORG/modflowapi/pull/8) * update package: manual variable address assembly updated to use xmipy get_variable_addr() * update additional manual variable address assembly statements * Refactor code and added functionality: @@ -43,19 +43,19 @@ * ArrayPointer: trap for arrays that are not adjusted by reduced node numbers (ex. idomain) * update setup.cfg * try reformatting the xmipy installation instructions -* fix(get value): fixed error handling when modflowapi fails to get a pointer to a value from the API (https://github.com/MODFLOW-USGS/modflowapi/pull/9) +* fix(get value): fixed error handling when modflowapi fails to get a pointer to a value from the API (https://github.com/MODFLOW-ORG/modflowapi/pull/9) Co-authored-by: scottrp <45947939+scottrp@users.noreply.github.com> * update(rhs, hcof, AdvancedInput): bug fixes for setting variable values for advanced inputs * update rhs and hcof to copy values to pointer instead of overwriting the pointer * add a check for AdvancedInput variables that do not have pointer support in xmipy * update setting routine for AdvancedInput -* refactor(EOL): change CRLF to LF line endings for source files (https://github.com/MODFLOW-USGS/modflowapi/pull/12) -* Use pyproject.toml for project metadata, add citation info (https://github.com/MODFLOW-USGS/modflowapi/pull/11) -* add(test_rhs_hcof_advanced): add additional test (https://github.com/MODFLOW-USGS/modflowapi/pull/13) +* refactor(EOL): change CRLF to LF line endings for source files (https://github.com/MODFLOW-ORG/modflowapi/pull/12) +* Use pyproject.toml for project metadata, add citation info (https://github.com/MODFLOW-ORG/modflowapi/pull/11) +* add(test_rhs_hcof_advanced): add additional test (https://github.com/MODFLOW-ORG/modflowapi/pull/13) * added test for getting and setting rhs, hcof, and advanced variable values * update project to use unix line separators * use np.testing.assert_allclose() instead of AssertionError -* Add missing RIV support to modflowapi (https://github.com/MODFLOW-USGS/modflowapi/pull/16) +* Add missing RIV support to modflowapi (https://github.com/MODFLOW-ORG/modflowapi/pull/16) * add(test_rhs_hcof_advanced): add additional test * added test for getting and setting rhs, hcof, and advanced variable values * update project to use unix line separators diff --git a/README.md b/README.md index c7b5460..886e35e 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # modflowapi -[![CI](https://github.com/MODFLOW-USGS/modflowapi/actions/workflows/ci.yml/badge.svg)](https://github.com/MODFLOW-USGS/modflowapi/actions/workflows/ci.yml) -[![GitHub contributors](https://img.shields.io/github/contributors/MODFLOW-USGS/modflowapi)](https://img.shields.io/github/contributors/MODFLOW-USGS/modflowapi) -[![GitHub tag](https://img.shields.io/github/tag/MODFLOW-USGS/modflowapi.svg)](https://github.com/MODFLOW-USGS/modflowapi/tags/latest) +[![CI](https://github.com/MODFLOW-ORG/modflowapi/actions/workflows/ci.yml/badge.svg)](https://github.com/MODFLOW-ORG/modflowapi/actions/workflows/ci.yml) +[![GitHub contributors](https://img.shields.io/github/contributors/MODFLOW-ORG/modflowapi)](https://img.shields.io/github/contributors/MODFLOW-ORG/modflowapi) +[![GitHub tag](https://img.shields.io/github/tag/MODFLOW-ORG/modflowapi.svg)](https://github.com/MODFLOW-ORG/modflowapi/tags/latest) [![PyPI License](https://img.shields.io/pypi/l/modflowapi)](https://pypi.python.org/pypi/modflowapi) [![PyPI Status](https://img.shields.io/pypi/status/modflowapi.png)](https://pypi.python.org/pypi/modflowapi) diff --git a/autotest/conftest.py b/autotest/conftest.py index 3845255..7aa4176 100644 --- a/autotest/conftest.py +++ b/autotest/conftest.py @@ -24,7 +24,7 @@ def get_mf6_examples_path() -> Path: if not __mf6_examples_path.is_dir(): __mf6_examples_path.mkdir(exist_ok=True) download_and_unzip( - url="https://github.com/MODFLOW-USGS/modflow6-examples/releases/download/current/modflow6-examples.zip", + url="https://github.com/MODFLOW-ORG/modflow6-examples/releases/download/current/modflow6-examples.zip", path=__mf6_examples_path, verbose=True, ) @@ -46,7 +46,7 @@ def is_nested(namfile) -> bool: def pytest_generate_tests(metafunc): # examples to skip: - # - ex-gwtgwt-mt3dms-p10: https://github.com/MODFLOW-USGS/modflow6/pull/1008 + # - ex-gwtgwt-mt3dms-p10: https://github.com/MODFLOW-ORG/modflow6/pull/1008 option_value = metafunc.config.option.mf6_examples_path t = metafunc.fixturenames if "mf6_example_namfiles" in metafunc.fixturenames and option_value is not None: diff --git a/cliff.toml b/cliff.toml index d8089d6..5e837de 100644 --- a/cliff.toml +++ b/cliff.toml @@ -10,7 +10,7 @@ body = """ {% for group, commits in commits | group_by(attribute="group") %} #### {{ group | upper_first }} {% for commit in commits %} - * [{{ commit.group }}{% if commit.scope %}({{ commit.scope }}){% endif %}](https://github.com/MODFLOW-USGS/modflowapi/commit/{{ commit.id }}): {% if commit.breaking %}[**breaking**] {% endif %}{{ commit.message | upper_first }}. Committed by {{ commit.author.name }} on {{ commit.author.timestamp | date(format="%Y-%m-%d") }}.\ + * [{{ commit.group }}{% if commit.scope %}({{ commit.scope }}){% endif %}](https://github.com/MODFLOW-ORG/modflowapi/commit/{{ commit.id }}): {% if commit.breaking %}[**breaking**] {% endif %}{{ commit.message | upper_first }}. Committed by {{ commit.author.name }} on {{ commit.author.timestamp | date(format="%Y-%m-%d") }}.\ {% endfor %} {% endfor %}\n """ diff --git a/pyproject.toml b/pyproject.toml index 866aea2..9c8828e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -60,7 +60,7 @@ lint = [ ] [project.urls] -Repository = "https://github.com/MODFLOW-USGS/modflowapi" +Repository = "https://github.com/MODFLOW-ORG/modflowapi" Publication = "https://doi.org/10.1016/j.envsoft.2021.105257" [tool.hatch.build.targets.sdist]