Skip to content

Commit

Permalink
JSON output refactor (#33)
Browse files Browse the repository at this point in the history
* Refactor of output to be more consistent with wccdm-obs.
bug fix for single subset.

* - Associated fields now correctly used to set quality flag.
- Fix for broken DAYCLI sequence and phenomenonTime.
- First order statistic appended to observed property when present.

* reportIdentifier set to uuid4

* reportIdentifier now sha512 of subset

* env variable fix.

* bytesio fix

* eccodes codes_write.

* Update of result time to be consistent with OMS (e.g. "Where sensor observation results are post-processed, the resultTime is the post-processing time, while the phenomenonTime is the time of initial interaction with the world.")

* Update to handling of z coordinate information.

* Fix to extract descriptions from flag tables.

* Update to tests

* Fixing test environment

* Fixing test environment- py versions

* Fixing test environment - eccodes path

* Use of dim eccodes base image, issues with conda eccodes install and paths.
(dim image also used in w2b where b2g may be run).

* eccodes path fix.

* eccodes path fix.

* eccodes path fix.

* flake8 fix

* Removal of redundant files.

* Updates following review.

* Update of conforms to

* Update of conforms to

* Update of conforms to
  • Loading branch information
david-i-berry authored Jan 6, 2025
1 parent d6f593d commit 90bfcdd
Show file tree
Hide file tree
Showing 9 changed files with 1,146 additions and 333 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.7, 3.8, 3.9]
python-version: ["3.9", "3.10", "3.11"]

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -36,6 +36,7 @@ jobs:
python3 setup.py install
- name: run tests ⚙️
run: |
export ECCODES_DEFINITION_PATH=/usr/share/miniconda/envs/__setup_conda/share/eccodes/definitions
cd tests
pytest
- name: run flake8 ⚙️
Expand Down
28 changes: 11 additions & 17 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,28 +19,22 @@
#
###############################################################################

#FROM ubuntu:latest
FROM wmoim/dim_eccodes_baseimage:2.28.0

FROM wmoim/dim_eccodes_baseimage:jammy-2.36.0
ENV DEBIAN_FRONTEND="noninteractive" \
TZ="Etc/UTC" \
ECCODES_DIR=/opt/eccodes \
ECCODES_DEFINITION_PATH=/opt/eccodes/share/eccodes/definitions \
PATH="${PATH}:/opt/eccodes/bin"

RUN echo "Acquire::Check-Valid-Until \"false\";\nAcquire::Check-Date \"false\";" | cat > /etc/apt/apt.conf.d/10no--check-valid-until \
&& apt-get update -y \
&& apt-get install -y ${BUILD_PACKAGES} libudunits2-0 \
&& apt-get remove --purge -y ${BUILD_PACKAGES} \
&& apt autoremove -y \
&& apt-get -q clean \
&& rm -rf /var/lib/apt/lists/*


COPY . /tmp/bufr2geojson
# Install additional packges
RUN echo apt-get update -y \
&& apt-get upgrade -y \
&& apt-get install -y libudunits2-0 curl

RUN cd /tmp/bufr2geojson && python3 setup.py install
# clean up
RUN cd /tmp && rm -r bufr2geojson
WORKDIR /tmp
COPY . /tmp
RUN cd /tmp && python3 setup.py install
RUN cd /tmp && rm -r ./*

WORKDIR /
WORKDIR /local

Loading

0 comments on commit 90bfcdd

Please sign in to comment.