merge save-aps into v2beta

.github/workflows/ci.yml

@@ -4,6 +4,8 @@ on:
   pull_request:
     branches:
       - main
+      - 'v?*b'
+      - 'v?*beta'
   push:
     branches:
       - main
@@ -15,40 +17,13 @@ permissions:
   contents: write
 
 env:
-    SKIP_DEPLOY: false
-    SKIP_INSTALL: true
+    SKIP_DEPLOY: true
+    SKIP_INSTALL: false
     SKIP_TEST: false
 
 jobs:
-  before_script:
-    runs-on: self-hosted
-
-    strategy:
-      matrix:
-        node-version: [ 20.x ]
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.x'
-
-      - name: Install dependencies
-        run: |
-          source /opt/conda/etc/profile.d/conda.sh
-          conda init bash
-          source ~/.bashrc
-          conda env remove --name ci_temp_env --yes || echo "Environment ci_temp_env does not exist"
-          conda create --prefix /home/runneruser/.conda/envs/ci_temp_env --clone ci_env
-          conda activate ci_temp_env
-        shell: bash
-
   test_sarvey:
     runs-on: self-hosted
-    needs: before_script
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -64,11 +39,12 @@ jobs:
           source /opt/conda/etc/profile.d/conda.sh
           conda init bash
           source ~/.bashrc
-          conda activate ci_temp_env
+          conda activate ci_env
           rm -rf tests/testdata
           # wget -nv -c -O testdata.zip https://seafile.projekt.uni-hannover.de/f/4b3be399dffa488e98db/?dl=1
           wget -nv -c -O testdata.zip https://seafile.projekt.uni-hannover.de/f/104b499f6f7e4360877d/?dl=1          
           unzip testdata.zip
+          mkdir -p test
           mv testdata tests/
           mamba list
           make pytest
@@ -79,7 +55,7 @@ jobs:
         run: |
           conda init bash
           source ~/.bashrc
-          source activate ci_temp_env
+          source activate ci_env
 
           # replace documentation address for tags befro make docs
           IFS='/' read -r OWNER REPO <<< "${GITHUB_REPOSITORY}"
@@ -165,7 +141,7 @@ jobs:
           source /opt/conda/etc/profile.d/conda.sh
           conda init bash
           source ~/.bashrc
-          conda activate ci_temp_env
+          conda activate ci_env
           make lint
         shell: bash
 
@@ -208,7 +184,7 @@ jobs:
           source /opt/conda/etc/profile.d/conda.sh
           conda init bash
           source ~/.bashrc
-          source activate ci_temp_env
+          source activate ci_env
           make urlcheck
         shell: bash
 
@@ -228,92 +204,112 @@ jobs:
           run: |
               source /opt/conda/etc/profile.d/conda.sh
               conda activate base
-              mamba env remove --name sarvey_testinstall --yes || echo "Environment sarvey_testinstall does not exist"
-              mamba clean --index-cache --tarballs --packages -y
-              pip install conda-merge
-              export PATH=$HOME/.local/bin:$PATH # workaround conda-merge not found!
-              wget https://raw.githubusercontent.com/insarlab/MiaplPy/main/conda-env.yml
-              conda-merge conda-env.yml tests/CI_docker/context/environment_sarvey.yml > env.yml
-              mamba env create --name sarvey_testinstall -f env.yml
+
+              conda create -n sarvey_testinstall python=3.10 pip  -y
               conda activate sarvey_testinstall
+              conda install conda-forge::pysolid -y
+              conda install conda-forge::gdal
               pip install git+https://github.com/insarlab/MiaplPy.git
-              pip install .
+
+              # get current branch for installation
+              IFS='/' read -r OWNER REPO <<< "${GITHUB_REPOSITORY}"
+
+              URL="https://github.com/${OWNER}/${REPO}"
+              URL_IO="https://${OWNER}.github.io/${REPO}"
+
+              echo "Repository URL: ${URL}"
+              echo "Repository Documentation URL: ${URL}"
+
+              if [[ "$GITHUB_REF" == refs/tags/* ]]; then
+                  current_ref="${GITHUB_REF##*/}"
+              elif [[ "$GITHUB_REF" == refs/heads/* ]]; then
+                  current_ref="${GITHUB_REF#refs/heads/}"
+              elif [[ "$GITHUB_REF" == refs/pull/* ]]; then
+                  current_ref="${GITHUB_HEAD_REF}"
+              else
+                  current_ref="${GITHUB_REF}"
+              fi
+
+              echo "Current branch/tag: ${URL}.git@$current_ref"
+              pip install git+${URL}.git@$current_ref
+              pip install sarvey[dev]
+
               OUTPUT=$(pip check) || { echo "$OUTPUT"; true; }
-              cd ..
+              conda list
               python -c "import sarvey; print(sarvey)"
           shell: bash
 
-  deploy_pages:
-    runs-on: self-hosted
-
-    needs: 
-      - test_sarvey
-      - test_urls
-      - test_styles
-    if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/')
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.x'
-
-      - name: Download docs
-        uses: actions/download-artifact@v4
-        with:
-          name: docs
-          path: docs/_build/html/
-
-      - name: Download coverage report
-        uses: actions/download-artifact@v4
-        with:
-          name: coverage-report
-          path: htmlcov/
-
-      - name: Download report.html
-        uses: actions/download-artifact@v4
-        with:
-          name: test-report
-
-      - name: Deploy to GitHub Pages
-        # trigger if merged into the main branch || published new tag
-        if: env.SKIP_DEPLOY == 'false' && github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/'))
-        run: |
-          rm -rf public
+  # deploy_pages:
+  #   runs-on: self-hosted
+
+  #   needs: 
+  #     - test_sarvey
+  #     - test_urls
+  #     - test_styles
+  #   if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/')
+  #   steps:
+  #     - name: Checkout code
+  #       uses: actions/checkout@v4
+
+  #     - name: Set up Python
+  #       uses: actions/setup-python@v5
+  #       with:
+  #         python-version: '3.x'
+
+  #     - name: Download docs
+  #       uses: actions/download-artifact@v4
+  #       with:
+  #         name: docs
+  #         path: docs/_build/html/
+
+  #     - name: Download coverage report
+  #       uses: actions/download-artifact@v4
+  #       with:
+  #         name: coverage-report
+  #         path: htmlcov/
+
+  #     - name: Download report.html
+  #       uses: actions/download-artifact@v4
+  #       with:
+  #         name: test-report
+
+  #     - name: Deploy to GitHub Pages
+  #       # trigger if merged into the main branch || published new tag
+  #       if: env.SKIP_DEPLOY == 'false' && github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/'))
+  #       run: |
+  #         rm -rf public
 
-          git clone --branch gh-pages https://github.com/${{ github.repository }} public
-
-          if [[ "${GITHUB_REF}" == refs/tags/* ]]; then
-            TAG_NAME=${GITHUB_REF##*/}
-            echo "Deploying to GitHub Pages for version tag: $TAG_NAME"
-            DOCS_PATH=public/tags/$TAG_NAME
-          else
-            echo "Deploying to GitHub Pages for main branch"
-            DOCS_PATH=public/main
-          fi
-
-          rm -rf  $DOCS_PATH
-          mkdir -p $DOCS_PATH/docs
-          mkdir -p $DOCS_PATH/images
-          mkdir -p $DOCS_PATH/coverage
-          mkdir -p $DOCS_PATH/test_reports
+  #         git clone --branch gh-pages https://github.com/${{ github.repository }} public
+
+  #         if [[ "${GITHUB_REF}" == refs/tags/* ]]; then
+  #           TAG_NAME=${GITHUB_REF##*/}
+  #           echo "Deploying to GitHub Pages for version tag: $TAG_NAME"
+  #           DOCS_PATH=public/tags/$TAG_NAME
+  #         else
+  #           echo "Deploying to GitHub Pages for main branch"
+  #           DOCS_PATH=public/main
+  #         fi
+
+  #         rm -rf  $DOCS_PATH
+  #         mkdir -p $DOCS_PATH/docs
+  #         mkdir -p $DOCS_PATH/images
+  #         mkdir -p $DOCS_PATH/coverage
+  #         mkdir -p $DOCS_PATH/test_reports
 
-          cp -r docs/_build/html/* $DOCS_PATH/docs
-          cp -r htmlcov/* $DOCS_PATH/coverage/
-          cp report.html $DOCS_PATH/test_reports/
-
-          ls -al $DOCS_PATH
-          ls -al $DOCS_PATH/docs
-          ls -al $DOCS_PATH/coverage
-          ls -al $DOCS_PATH/test_reports
-
-        shell: bash
-
-      - name: Upload to GitHub Pages
-        if: env.SKIP_DEPLOY == 'false'
-        uses: peaceiris/actions-gh-pages@v4
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./public
+  #         cp -r docs/_build/html/* $DOCS_PATH/docs
+  #         cp -r htmlcov/* $DOCS_PATH/coverage/
+  #         cp report.html $DOCS_PATH/test_reports/
+
+  #         ls -al $DOCS_PATH
+  #         ls -al $DOCS_PATH/docs
+  #         ls -al $DOCS_PATH/coverage
+  #         ls -al $DOCS_PATH/test_reports
+
+  #       shell: bash
+
+  #     - name: Upload to GitHub Pages
+  #       if: env.SKIP_DEPLOY == 'false'
+  #       uses: peaceiris/actions-gh-pages@v4
+  #       with:
+  #         github_token: ${{ secrets.GITHUB_TOKEN }}
+  #         publish_dir: ./public

HISTORY.rst

@@ -2,10 +2,21 @@
 History
 =======
 
+Future major version
+--------------------
+
+* Export data to GIS format in WGS84 coordinates.
+* Change file name coordinates_UTM.h5 to coordinates_map.h5.
+* Use Transverse Mercator instead of UTM as map coordinates.
+
 
 Future minor version (release soon)
 -----------------------------------
 
+* Update CI docker builder
+* Update runner to test installation
+* Update documentation with new instruction for installation including pip
+* Fix numerical problems when computing grid size.
 
 1.2.0 (2025-02-19)
 ------------------

README.rst

@@ -10,7 +10,7 @@ Open-source InSAR time series analysis software developed within the project SAR
 Documentation
 -------------
 The documentation with installation instructions, processing steps, and examples with a demo dataset can be found at:
-https://luhipi.github.io/sarvey/main/docs/
+https://luhipi.github.io/sarvey/main
 
 Discussion
 ----------
@@ -26,16 +26,12 @@ Status
         :target: https://github.com/luhipi/sarvey/actions
         :alt: Pipelines
 .. image:: https://img.shields.io/static/v1?label=Documentation&message=GitHub%20Pages&color=blue
-        :target: https://luhipi.github.io/sarvey/main/docs/
+        :target: https://luhipi.github.io/sarvey/main
         :alt: Documentation
 .. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.12544130.svg
         :target: https://doi.org/10.5281/zenodo.12544130
         :alt: DOI
 
-
-See also the latest coverage_ report and the pytest_ HTML report.
-
-
 License
 -------
 
@@ -191,15 +187,13 @@ This package was created with Cookiecutter_ and the `fernlab/cookiecutter-python
 
 .. _Cookiecutter: https://github.com/audreyr/cookiecutter
 .. _`fernlab/cookiecutter-python-package`: https://git.gfz-potsdam.de/fernlab/products/cookiecutters/cookiecutter-python-package
-.. _coverage: https://luhipi.github.io/sarvey/main/coverage/
-.. _pytest: https://luhipi.github.io/sarvey/main/test_reports/report.html
-.. _processing: https://luhipi.github.io/sarvey/main/docs/processing.html
-.. _`processing steps`: https://luhipi.github.io/sarvey/main/docs/processing.html#processing-steps-for-two-step-unwrapping-workflow
-.. _preparation: https://luhipi.github.io/sarvey/main/docs/preparation.html
-.. _`Two-step unwrapping`: https://luhipi.github.io/sarvey/main/docs/processing.html#processing-steps-for-two-step-unwrapping-workflow
-.. _`One-step unwrapping`: https://luhipi.github.io/sarvey/main/docs/processing.html#processing-steps-for-one-step-unwrapping-workflow
-.. _`installation instruction`: https://luhipi.github.io/sarvey/main/docs/installation.html
-.. _`history`: https://luhipi.github.io/sarvey/main/docs/history.html
+.. _processing: https://luhipi.github.io/sarvey/main/processing.html
+.. _`processing steps`: https://luhipi.github.io/sarvey/main/processing.html#processing-steps-for-two-step-unwrapping-workflow
+.. _preparation: https://luhipi.github.io/sarvey/main/preparation.html
+.. _`Two-step unwrapping`: https://luhipi.github.io/sarvey/main/processing.html#processing-steps-for-two-step-unwrapping-workflow
+.. _`One-step unwrapping`: https://luhipi.github.io/sarvey/main/processing.html#processing-steps-for-one-step-unwrapping-workflow
+.. _`installation instruction`: https://luhipi.github.io/sarvey/main/installation.html
+.. _`history`: https://luhipi.github.io/sarvey/main/history.html
 .. _MiaplPy: https://github.com/insarlab/MiaplPy
 .. _MintPy: https://github.com/insarlab/MintPy
 .. _ISCE: https://github.com/isce-framework/isce2