From 9b235392a249837f00fe04437f571400f2628397 Mon Sep 17 00:00:00 2001 From: "Karl N. Kappler" Date: Fri, 30 Aug 2024 15:18:14 -0700 Subject: [PATCH 1/7] test new workflow with mtpy-v2 --- .github/workflows/tests.yml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 60cc5fb6..d1859ad1 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -34,15 +34,25 @@ jobs: run: | python --version conda install -c conda-forge pytest pytest-cov certifi">=2017.4.17" pandoc + + git clone https://github.com/MTgeophysics/mtpy-v2.git # @main + cd mtpy-v2 + conda env create -f environment.yml --name=aurora-test + source activate aurora-test + pip install git+https://github.com/simpeg/pydiso.git + pip install -e . # executes mtpy-v2 setup.py + pip uninstall aurora + cd ../ pip install -r requirements-dev.txt - pip install git+https://github.com/kujaku11/mt_metadata.git@main - pip install git+https://github.com/kujaku11/mth5.git@master - pip install git+https://github.com/MTgeophysics/mtpy-v2.git@main + # these are installed by mtpy-v2 now + # pip install git+https://github.com/kujaku11/mt_metadata.git@main + # pip install git+https://github.com/kujaku11/mth5.git@master - name: Install Our Package run: | pip install -e . conda list + pip freeze - name: Install Jupyter and dependencies run: | From 741004c4276792132714ebb9f2d6ee99c46df4ec Mon Sep 17 00:00:00 2001 From: "Karl N. Kappler" Date: Fri, 30 Aug 2024 15:20:37 -0700 Subject: [PATCH 2/7] test new workflow with mtpy-v2 --- .github/workflows/tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d1859ad1..a526f1be 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -37,7 +37,8 @@ jobs: git clone https://github.com/MTgeophysics/mtpy-v2.git # @main cd mtpy-v2 - conda env create -f environment.yml --name=aurora-test + # conda env create -f environment.yml --name=aurora-test + conda env update --file environment.yml source activate aurora-test pip install git+https://github.com/simpeg/pydiso.git pip install -e . # executes mtpy-v2 setup.py From fc4b4e0dc445d62795e6c9a3a4bc17c6aceecacc Mon Sep 17 00:00:00 2001 From: "Karl N. Kappler" Date: Fri, 30 Aug 2024 15:24:16 -0700 Subject: [PATCH 3/7] test new workflow with mtpy-v2 --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a526f1be..236529a1 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -38,8 +38,8 @@ jobs: git clone https://github.com/MTgeophysics/mtpy-v2.git # @main cd mtpy-v2 # conda env create -f environment.yml --name=aurora-test - conda env update --file environment.yml - source activate aurora-test + conda env update --file environment.yml # --prune + # source activate aurora-test pip install git+https://github.com/simpeg/pydiso.git pip install -e . # executes mtpy-v2 setup.py pip uninstall aurora From c0ce42a936f25e480d9d9118bc1ac9892d0500e6 Mon Sep 17 00:00:00 2001 From: "Karl N. Kappler" Date: Fri, 30 Aug 2024 15:30:08 -0700 Subject: [PATCH 4/7] test new workflow with mtpy-v2 --- .github/workflows/tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 236529a1..66325995 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -37,8 +37,9 @@ jobs: git clone https://github.com/MTgeophysics/mtpy-v2.git # @main cd mtpy-v2 + tail -n+2 environment.yml >> unnamed_environment.yaml # conda env create -f environment.yml --name=aurora-test - conda env update --file environment.yml # --prune + conda env update --file unnamed_environment.yaml # --prune # source activate aurora-test pip install git+https://github.com/simpeg/pydiso.git pip install -e . # executes mtpy-v2 setup.py From 88b4d160378f5a6649272470c23567ddda89135b Mon Sep 17 00:00:00 2001 From: "Karl N. Kappler" Date: Fri, 30 Aug 2024 16:48:33 -0700 Subject: [PATCH 5/7] use self's aurora branch for test (not mtpy installed) --- .github/workflows/tests.yml | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 66325995..465db866 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -34,21 +34,11 @@ jobs: run: | python --version conda install -c conda-forge pytest pytest-cov certifi">=2017.4.17" pandoc - - git clone https://github.com/MTgeophysics/mtpy-v2.git # @main - cd mtpy-v2 - tail -n+2 environment.yml >> unnamed_environment.yaml - # conda env create -f environment.yml --name=aurora-test - conda env update --file unnamed_environment.yaml # --prune - # source activate aurora-test - pip install git+https://github.com/simpeg/pydiso.git - pip install -e . # executes mtpy-v2 setup.py - pip uninstall aurora - cd ../ pip install -r requirements-dev.txt - # these are installed by mtpy-v2 now - # pip install git+https://github.com/kujaku11/mt_metadata.git@main - # pip install git+https://github.com/kujaku11/mth5.git@master + pip install git+https://github.com/kujaku11/mt_metadata.git@main + pip install git+https://github.com/kujaku11/mth5.git@master + pip install git+https://github.com/MTgeophysics/mtpy-v2.git@main + pip uninstall aurora - name: Install Our Package run: | From e47c5fc38cbe54b356d50ff8897f883d37f0e5b9 Mon Sep 17 00:00:00 2001 From: "Karl N. Kappler" Date: Fri, 30 Aug 2024 17:03:54 -0700 Subject: [PATCH 6/7] add -y to uninstall --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 465db866..3e5cffe8 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -38,7 +38,7 @@ jobs: pip install git+https://github.com/kujaku11/mt_metadata.git@main pip install git+https://github.com/kujaku11/mth5.git@master pip install git+https://github.com/MTgeophysics/mtpy-v2.git@main - pip uninstall aurora + pip uninstall aurora -y - name: Install Our Package run: | From aca474225cacc3a3c4ab1ace9bce8b439246c046 Mon Sep 17 00:00:00 2001 From: "Karl N. Kappler" Date: Fri, 30 Aug 2024 17:13:44 -0700 Subject: [PATCH 7/7] bump version minor --- .bumpversion.cfg | 2 +- aurora/__init__.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index b1220b14..9055866d 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,3 +1,3 @@ [bumpversion] -current_version = 0.3.14 +current_version = 0.4.0 files = setup.py aurora/__init__.py diff --git a/aurora/__init__.py b/aurora/__init__.py index b96fb01f..4c72671c 100644 --- a/aurora/__init__.py +++ b/aurora/__init__.py @@ -1,4 +1,4 @@ -__version__ = "0.3.14" +__version__ = "0.4.0" import sys from loguru import logger diff --git a/setup.py b/setup.py index 4ae6be58..75616607 100644 --- a/setup.py +++ b/setup.py @@ -52,6 +52,6 @@ test_suite="tests", tests_require=test_requirements, url="https://github.com/simpeg/aurora", - version="0.3.14", + version="0.4.0", zip_safe=False, )