TNO Intern

Commit 241b9313 authored by Arjo Segers's avatar Arjo Segers
Browse files

Merge branch 'fix-superobs' into 'master' 

Fix superobs

See merge request !18
parents ec178fd4 141dca4f

CHANGELOG

+6 −0
Original line number Diff line number Diff line
@@ -533,3 +533,9 @@ v2.12 


Support running CSO within a virtual environment.





v2.13

-----



Updates for latest python versions.

Improved error checks.

README.md

+33 −0
Original line number Diff line number Diff line
@@ -89,6 +89,39 @@ When finished, leave from the virtual environment using: 


    deactivate



Eventually create the following script that activates the envioronment,

or creates it if not present yet:



    #

    # Source this script to setup:

    #

    #    .  this_script

    #

    

    # virtual environment exists already?

    if [ -f .venv/bin/activate ]; then



      # activate:

      source .venv/bin/activate



    else



      # eventually enable latest python version:

      #module load python/3.13.1



      # init virtual environment:

      python3 -m venv --prompt cso .venv



      # activate:

      source .venv/bin/activate



      # upgrade pip:

      pip install --upgrade pip



      # install local codes:

      pip install --editable .



    fi

doc/source/history.rst

+8 −5
Original line number Diff line number Diff line
@@ -119,6 +119,9 @@ A summary of the versions and changes. 
* | *v2.12*

  | Support running in Python virtual environment.

  

* | *v2.13*

  | Minor updates to trap errors and support latest Python versions.





To be included

==============
@@ -159,7 +162,7 @@ A wishlist of developments. 
How to create a version tag

===========================



Example for tag "v2.12".

Example for tag "v2.13".



1. Update file formatting following conventions.
@@ -179,17 +182,17 @@ Example for tag "v2.12". 


   c. Change the release tag that will also be imported to the documenation in the `pyproject.toml <../../../pyproject.toml>`_ file::



        release = "2.12"

        release = "2.13"

    

   d. Commit and push these changes::



       git commit -m 'Defined v2.12' .

       git commit -m 'Defined v2.13' .

       git push



4. Tag and push the code to the git repository::



      git tag -a 'v2.12' -m 'Tagged v2.12'

      git push origin v2.12

      git tag -a 'v2.13' -m 'Tagged v2.13'

      git push origin v2.13

pyproject.toml

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" 


[project]

name = "cso"

version = "2.12"

version = "2.13"

authors = [

    { name = "Arjo Segers" },

    { name = "Lewis Blake" },

src/cso/cso_file.py

+4 −1
Original line number Diff line number Diff line
@@ -58,6 +58,9 @@ 
# 2025-10, Arjo Segers

#   Replace ' and ' by ' & ' when selecting records.

#

# 2026-01, Arjo Segers

#   Updated use of Dataset.dims following deprication warning.

#



########################################################################

###
@@ -1128,7 +1131,7 @@ class CSO_File(object): 
        logging.info(indent + "pixel selection ...")



        # init selection, by default accept all:

        selected = numpy.ones((self.ds.dims["pixel"],), "bool")

        selected = numpy.ones((self.ds.sizes["pixel"],), "bool")



        # init history:

        history = []