TNO Intern

Pages

Arjo Segersrequested to merge
pages into master

Merge request reports

doc/source/documentation.rst

+2 −2
Changes for doc/source/documentation.rst: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ This should now be done when code is changed using a '*pipeline*'. 
   .. sourcecode:: yaml



      # The Docker image that will be used to build your app

      image: python:3.11

      image: python:latest-slim



      # Functions that should be executed before the build script is run

      before_script:
@@ -300,7 +300,7 @@ This should now be done when code is changed using a '*pipeline*'. 
            when: always

        script:

          - cd doc

          - make html

          - sphinx-build source build/html

          - cd ..

          - mkdir public

          - cp -r doc/build/html/* public

src/cso/__init__.py

+3 −0
Changes for src/cso/__init__.py: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -120,11 +120,14 @@ and are defined according to the following hierchy: 
# store version number:

try:

    from importlib import metadata



    __version__ = metadata.version(__package__)

except:

    import os



    if "CSO_PREFIX" in os.environ.keys():

        import tomllib



        with open(os.path.join(os.environ["CSO_PREFIX"], "pyproject.toml"), "rb") as f:

            pp = tomllib.load(f)

        __version__ = pp["project"]["version"]

src/cso/cso_colocate.py

+1 −1

File changed.

Contains only whitespace changes.

src/cso/cso_dataspace.py

+1 −1

File changed.

Contains only whitespace changes.

src/cso/cso_earthaccess.py

+3 −4
Changes for src/cso/cso_earthaccess.py: 3 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -799,7 +799,6 @@ class CSO_EarthAccess_Download_Listing(utopya.UtopyaRc): 
            for root, dirs, files in os.walk(bdir):

                # loop over files:

                for fname in files:



                    # subdir relative to listing file:

                    subdir = os.path.relpath(root, start=bdir)

                    # info ...
@@ -818,12 +817,10 @@ class CSO_EarthAccess_Download_Listing(utopya.UtopyaRc): 


                    # data file?

                    if fnmatch.fnmatch(fname, fpattern):



                        # expected filenames:

                        #   AERDB_L2_VIIRS_SNPP.A2022001.0342.002.2023076013614.nc

                        parts = fname.split(".")

                        if len(parts) == 6:



                            # second is year-julday, strip the "A" of acquisition:

                            try:

                                t1 = datetime.datetime.strptime(parts[1][1:], "%Y%j")
@@ -854,7 +851,9 @@ class CSO_EarthAccess_Download_Listing(utopya.UtopyaRc): 
                        data["orbit"] = orbit



                        # update record:

                        listing.UpdateRecord( os.path.join(subdir,fname), data, indent=f"{indent}    ")

                        listing.UpdateRecord(

                            os.path.join(subdir, fname), data, indent=f"{indent}    "

                        )



                    # endfor # filename match