Commit aebb024d authored by m.bottaccio@bopen.eu's avatar m.bottaccio@bopen.eu
Browse files

Merge branch 'development' into '1081-delete-customisation-bug'

# Conflicts:
#   CHANGES.md
#   CONTRIBUTING.md
parents fee4a227 8c2c7dee
......@@ -55,7 +55,7 @@ variables: &variables
LANG: "en_US.utf8"
CHANNEL_OPTS: "--override-channels -c anaconda -c conda-forge -c file://$CI_PROJECT_DIR/conda-channel"
CONDA_ALWAYS_YES: "true"
CONDABIN: 'C:\Miniconda3;C:\Miniconda3\Library\mingw-w64\bin;C:\Miniconda3\Library\usr\bin;C:\Miniconda3\Library\bin;C:\Miniconda3\Scripts;C:\Users\Admin\miniconda3\condabin;C:\Users\datatailor_admin\miniconda3\condabin;C:\Users\datatailor_admin\miniconda3\Scripts;C:\Users\datatailor_admin\miniconda3\Library\bin'
CONDABIN: 'C:\ProgramData\Miniconda3\Library\bin;C:\ProgramData\Miniconda3\Scripts;C:\Users\datatailor_admin\miniconda3\condabin;C:\Users\datatailor_admin\miniconda3\Scripts;C:\Users\datatailor_admin\miniconda3\Library\bin'
# to cache both npm modules and Cypress binary we use environment variables
# to point at the folders we can list as paths in "cache" job settings
npm_config_cache: "$CI_PROJECT_DIR/epct-webui/.npm"
......@@ -182,7 +182,7 @@ build linux plugins:
build linux gdal:
<<: *build_common_linux
script:
- conda build $CHANNEL_OPTS $BUILD_OPTS ./conda
- conda build $CHANNEL_OPTS $BUILD_OPTS ./msg-gdal-driver
# WINDOWS build section
.build_common_win: &build_common_win
......@@ -207,21 +207,23 @@ build linux gdal:
build win core:
<<: *build_common_win
script:
- conda build --override-channels -c defaults -c conda-forge -c %CI_PROJECT_DIR%\conda-channel --output-folder conda-channel ./epct ./epct-restapi
- IF ($errorlevel -ne 0) {exit $errorlevel}
- conda build --override-channels -c defaults -c conda-forge -c $env:CI_PROJECT_DIR\conda-channel --output-folder conda-channel ./epct ./epct-restapi
build win webui:
<<: *build_common_win
script:
- set DT_VERSION=0.0.0
- conda build --override-channels -c defaults -c conda-forge -c %CI_PROJECT_DIR%\conda-channel --output-folder conda-channel ./epct-webui
- IF ($errorlevel -ne 0) {exit $errorlevel}
- $env:DT_VERSION="0.0.0"
- conda build --override-channels -c defaults -c conda-forge -c $env:CI_PROJECT_DIR\conda-channel --output-folder conda-channel ./epct-webui
build win gdal:
<<: *build_common_win
script:
- conda build --override-channels -c defaults -c conda-forge -c $env:CI_PROJECT_DIR\conda-channel --output-folder conda-channel $env:CI_PROJECT_DIR\msg-gdal-driver
build win plugin-gis:
<<: *build_common_win
script:
- conda build --override-channels -c defaults -c conda-forge -c %CI_PROJECT_DIR%\conda-channel --output-folder conda-channel ./epct_plugin_gis ./epct_plugin_fist_iasil1c
- IF ($errorlevel -ne 0) {exit $errorlevel}
- conda build --override-channels -c defaults -c conda-forge -c $env:CI_PROJECT_DIR\conda-channel --output-folder conda-channel ./epct_plugin_gis ./epct_plugin_fist_iasil1c
# LINUX data tailor installer
installer linux:
......@@ -238,7 +240,7 @@ installer linux:
before_script:
- pip download --no-deps falcon-multipart
- conda index $CI_PROJECT_DIR/conda-channel
- conda create --name epct-installer python=3.6
- conda create --name epct-installer python=3.9
- conda init bash && source ~/.bashrc && conda activate epct-installer
- export DT_VERSION="0.0.0"
script:
......@@ -273,7 +275,7 @@ installer linux:
- if: $CI_MERGE_REQUEST_ID
before_script:
- conda index $CI_PROJECT_DIR/conda-channel
- conda create --name epct-tests python=3.6 pytest pytest-cov
- conda create --name epct-tests python=3.9 pytest pytest-cov
- conda init bash && source ~/.bashrc && conda activate epct-tests
needs:
- build linux core
......@@ -569,7 +571,9 @@ tests linux webui validation:
expire_in: 1 day
tests linux proc validation:
<<: *common_linux
image: miniconda3-build-centos:latest
tags:
- linux-memory
stage: test_proc
dependencies:
- build linux core
......@@ -577,7 +581,7 @@ tests linux proc validation:
- build linux gdal
before_script:
- conda index $CI_PROJECT_DIR/conda-channel
- conda create --name epct-tests python=3.6 pytest pytest-cov
- conda create --name epct-tests python=3.9 pytest pytest-cov
- conda init bash && source ~/.bashrc && conda activate epct-tests
needs:
- build linux core
......@@ -679,7 +683,11 @@ tests linux installer:
needs:
- build win core
- build win webui
- build win gdal
- build win plugin-gis
before_script:
- $env:Path = "$env:CONDABIN;$env:Path"
- conda init powershell
rules:
- if: $CI_COMMIT_TAG
- if: $CI_MERGE_REQUEST_ID
......@@ -690,6 +698,7 @@ tests win validation:
<<: *test_common_win
dependencies:
- build win core
- build win gdal
- build win plugin-gis
script:
- $env:Path = "$env:CONDABIN;$env:Path"
......@@ -697,19 +706,18 @@ tests win validation:
- if(!(Test-Path -Path $env:CI_PROJECT_DIR\conda-channel)){New-Item -ItemType directory -Path $env:CI_PROJECT_DIR\conda-channel}
- conda index $env:CI_PROJECT_DIR\conda-channel
- $env:CI_JOB_ID
- conda create --name $env:CI_JOB_ID python=3.6 pytest pytest-cov
- conda create --name $env:CI_JOB_ID python=3.9 pytest pytest-cov
- if (Test-Path -Path C:\Users\Admin\) {invoke-expression -Command C:\Users\Admin\Documents\WindowsPowerShell\profile.ps1}
- if (Test-Path -Path C:\Users\datatailor_admin\) {invoke-expression -Command $profile}
- if (Test-Path -Path C:\Users\datatailor_admin\) {invoke-expression -Command C:\Users\datatailor_admin\Documents\WindowsPowerShell\Microsoft.PowerShell_profile}
- conda activate $env:CI_JOB_ID
- conda env list
- conda install -y --override-channels -c defaults -c conda-forge -c $env:CI_PROJECT_DIR\conda-channel epct epct_restapi epct_plugin_gis
- conda install -c eumetsat msg-gdal-driver
- conda install -y --override-channels -c defaults -c conda-forge -c $env:CI_PROJECT_DIR\conda-channel epct epct_restapi epct_plugin_gis msg-gdal-driver
- $env:ECCODES_SAMPLE_PATH="$env:CONDA_PREFIX\Library\share\eccodes\samples"
- $env:ECCODES_DEFINITION_PATH="$env:CONDA_PREFIX\Library\share\eccodes\definitions"
- $env:GDAL_DATA="$env:CONDA_PREFIX\Library\share\gdal"
- $env:GDAL_DRIVER_PATH="$env:CONDA_PREFIX\Library\lib\gdalplugins"
- $env:GDAL_VRT_ENABLE_PYTHON="YES"
- $env:PYTHONSO="python36"
- $env:PYTHONSO="python39"
- gci env:* | sort-object name
- epct info
- pip install --no-deps --ignore-installed falcon_multipart
......@@ -751,6 +759,7 @@ tests win long-validation:
<<: *test_common_win
dependencies:
- build win core
- build win gdal
- build win plugin-gis
script:
- $env:Path = "$env:CONDABIN;$env:Path"
......@@ -758,21 +767,20 @@ tests win long-validation:
- if(!(Test-Path -Path $env:CI_PROJECT_DIR\conda-channel)){New-Item -ItemType directory -Path $env:CI_PROJECT_DIR\conda-channel}
- conda index $env:CI_PROJECT_DIR\conda-channel
- $env:CI_JOB_ID
- conda create --name $env:CI_JOB_ID python=3.6 pytest pytest-cov
- conda create --name $env:CI_JOB_ID python=3.9 pytest pytest-cov
- if (Test-Path -Path C:\Users\Admin\) {invoke-expression -Command C:\Users\Admin\Documents\WindowsPowerShell\profile.ps1}
- if (Test-Path -Path C:\Users\datatailor_admin\) {invoke-expression -Command $profile}
- if (Test-Path -Path C:\Users\datatailor_admin\) {invoke-expression -Command C:\Users\datatailor_admin\Documents\WindowsPowerShell\Microsoft.PowerShell_profile}
- conda activate $env:CI_JOB_ID
- conda env list
- conda install -y --override-channels -c defaults -c conda-forge -c $env:CI_PROJECT_DIR\conda-channel epct epct_restapi epct_plugin_gis
- conda install -c eumetsat msg-gdal-driver
- epct info
- conda install -y --override-channels -c defaults -c conda-forge -c $env:CI_PROJECT_DIR\conda-channel epct epct_restapi epct_plugin_gis msg-gdal-driver
- epct info
- pip install --no-deps --ignore-installed falcon_multipart
- $env:ECCODES_SAMPLE_PATH="$env:CONDA_PREFIX\Library\share\eccodes\samples"
- $env:ECCODES_DEFINITION_PATH="$env:CONDA_PREFIX\Library\share\eccodes\definitions"
- $env:GDAL_DATA="$env:CONDA_PREFIX\Library\share\gdal"
- $env:GDAL_DRIVER_PATH="$env:CONDA_PREFIX\Library\lib\gdalplugins"
- $env:GDAL_VRT_ENABLE_PYTHON="YES"
- $env:PYTHONSO="python36"
- $env:PYTHONSO="python39"
- gci env:* | sort-object name
- pytest --durations=0 --junitxml=$env:CI_PROJECT_DIR\win-epct-validation-longtests.xml -m longrunning validation_tests\
- conda deactivate
......@@ -792,6 +800,7 @@ tests win functional:
<<: *test_common_win
dependencies:
- build win core
- build win gdal
- build win plugin-gis
script:
- $env:Path = "$env:CONDABIN;$env:Path"
......@@ -799,19 +808,18 @@ tests win functional:
- if(!(Test-Path -Path $env:CI_PROJECT_DIR\conda-channel)){New-Item -ItemType directory -Path $env:CI_PROJECT_DIR\conda-channel}
- conda index $env:CI_PROJECT_DIR\conda-channel
- $env:CI_JOB_ID
- conda create --name $env:CI_JOB_ID python=3.6 pytest pytest-cov
- conda create --name $env:CI_JOB_ID python=3.9 pytest pytest-cov
- if (Test-Path -Path C:\Users\Admin\) {invoke-expression -Command C:\Users\Admin\Documents\WindowsPowerShell\profile.ps1}
- if (Test-Path -Path C:\Users\datatailor_admin\) {invoke-expression -Command $profile}
- if (Test-Path -Path C:\Users\datatailor_admin\) {invoke-expression -Command C:\Users\datatailor_admin\Documents\WindowsPowerShell\Microsoft.PowerShell_profile}
- conda activate $env:CI_JOB_ID
- conda env list
- conda install -y --override-channels -c defaults -c conda-forge -c $env:CI_PROJECT_DIR\conda-channel epct epct_restapi epct_plugin_gis
- conda install -c eumetsat msg-gdal-driver
- conda install -y --override-channels -c defaults -c conda-forge -c $env:CI_PROJECT_DIR\conda-channel epct epct_restapi epct_plugin_gis msg-gdal-driver
- $env:ECCODES_SAMPLE_PATH="$env:CONDA_PREFIX\Library\share\eccodes\samples"
- $env:ECCODES_DEFINITION_PATH="$env:CONDA_PREFIX\Library\share\eccodes\definitions"
- $env:GDAL_DATA="$env:CONDA_PREFIX\Library\share\gdal"
- $env:GDAL_DRIVER_PATH="$env:CONDA_PREFIX\Library\lib\gdalplugins"
- $env:GDAL_VRT_ENABLE_PYTHON="YES"
- $env:PYTHONSO="python36"
- $env:PYTHONSO="python39"
- gci env:* | sort-object name
- epct info
- pip install --no-deps --ignore-installed falcon_multipart
......@@ -837,9 +845,9 @@ tests win epct:
- if(!(Test-Path -Path $env:CI_PROJECT_DIR\conda-channel)){New-Item -ItemType directory -Path $env:CI_PROJECT_DIR\conda-channel}
- conda index $env:CI_PROJECT_DIR\conda-channel
- $env:CI_JOB_ID
- conda create --name $env:CI_JOB_ID python=3.6 pytest pytest-cov
- conda create --name $env:CI_JOB_ID python=3.9 pytest pytest-cov
- if (Test-Path -Path C:\Users\Admin\) {invoke-expression -Command C:\Users\Admin\Documents\WindowsPowerShell\profile.ps1}
- if (Test-Path -Path C:\Users\datatailor_admin\) {invoke-expression -Command $profile}
- if (Test-Path -Path C:\Users\datatailor_admin\) {invoke-expression -Command C:\Users\datatailor_admin\Documents\WindowsPowerShell\Microsoft.PowerShell_profile}
- conda activate $env:CI_JOB_ID
- conda env list
- conda install -y --override-channels -c defaults -c conda-forge -c $env:CI_PROJECT_DIR\conda-channel epct
......@@ -849,7 +857,7 @@ tests win epct:
- $env:GDAL_DATA="$env:CONDA_PREFIX\Library\share\gdal"
- $env:GDAL_DRIVER_PATH="$env:CONDA_PREFIX\Library\lib\gdalplugins"
- $env:GDAL_VRT_ENABLE_PYTHON="YES"
- $env:PYTHONSO="python36"
- $env:PYTHONSO="python39"
- gci env:* | sort-object name
- cd epct\tests
- pytest -vv --durations=0 --cov=epct --junitxml=$env:CI_PROJECT_DIR\win-epct-functional-tests.xml -k "test_"
......@@ -868,6 +876,7 @@ tests win epct-plugin-gis:
<<: *test_common_win
dependencies:
- build win core
- build win gdal
- build win plugin-gis
script:
- $env:Path = "$env:CONDABIN;$env:Path"
......@@ -875,21 +884,21 @@ tests win epct-plugin-gis:
- if(!(Test-Path -Path $env:CI_PROJECT_DIR\conda-channel)){New-Item -ItemType directory -Path $env:CI_PROJECT_DIR\conda-channel}
- conda index $env:CI_PROJECT_DIR\conda-channel
- $env:CI_JOB_ID
- conda create --name $env:CI_JOB_ID python=3.6 pytest pytest-cov
- conda create --name $env:CI_JOB_ID python=3.9 pytest pytest-cov
- if (Test-Path -Path C:\Users\Admin\) {invoke-expression -Command C:\Users\Admin\Documents\WindowsPowerShell\profile.ps1}
- if (Test-Path -Path C:\Users\datatailor_admin\) {invoke-expression -Command C:\Users\datatailor_admin\Documents\WindowsPowerShell\Microsoft.PowerShell_profile.ps1}
- if (Test-Path -Path C:\Users\datatailor_admin\) {invoke-expression -Command C:\Users\datatailor_admin\Documents\WindowsPowerShell\Microsoft.PowerShell_profile}
- conda activate $env:CI_JOB_ID
- conda env list
- conda install -y --override-channels -c defaults -c conda-forge -c $env:CI_PROJECT_DIR\conda-channel epct epct_plugin_gis
- conda install -c eumetsat msg-gdal-driver
- conda install -y --override-channels -c defaults -c conda-forge -c $env:CI_PROJECT_DIR\conda-channel epct epct_plugin_gis msg-gdal-driver
- $env:ECCODES_SAMPLE_PATH="$env:CONDA_PREFIX\Library\share\eccodes\samples"
- $env:ECCODES_DEFINITION_PATH="$env:CONDA_PREFIX\Library\share\eccodes\definitions"
- $env:GDAL_DATA="$env:CONDA_PREFIX\Library\share\gdal"
- $env:GDAL_DRIVER_PATH="$env:CONDA_PREFIX\Library\lib\gdalplugins"
- $env:GDAL_VRT_ENABLE_PYTHON="YES"
- $env:PYTHONSO="python36"
- $env:PYTHONSO="python39"
- gci env:* | sort-object name
- epct info
- epct
- gdalinfo --formats
- cd epct_plugin_gis\tests
- pytest -vv --durations=0 --cov=epct_plugin_gis --junitxml=$env:CI_PROJECT_DIR\win-epct-plugin-gis-functional-tests.xml -k "test_"
- conda deactivate
......@@ -913,11 +922,12 @@ tests win epct-restapi:
- if(!(Test-Path -Path $env:CI_PROJECT_DIR\conda-channel)){New-Item -ItemType directory -Path $env:CI_PROJECT_DIR\conda-channel}
- conda index $env:CI_PROJECT_DIR\conda-channel
- $env:CI_JOB_ID
- conda create --name $env:CI_JOB_ID python=3.6 pytest pytest-cov
- conda create --name $env:CI_JOB_ID python=3.9 pytest pytest-cov
- if (Test-Path -Path C:\Users\Admin\) {invoke-expression -Command C:\Users\Admin\Documents\WindowsPowerShell\profile.ps1}
- if (Test-Path -Path C:\Users\datatailor_admin\) {invoke-expression -Command $profile}
- if (Test-Path -Path C:\Users\datatailor_admin\) {invoke-expression -Command C:\Users\datatailor_admin\Documents\WindowsPowerShell\Microsoft.PowerShell_profile}
- conda activate $env:CI_JOB_ID
- conda env list
- gci env:* | sort-object name
- conda install -y --override-channels -c defaults -c conda-forge -c $env:CI_PROJECT_DIR\conda-channel epct epct_restapi
- pip install --no-deps --ignore-installed falcon_multipart
- $env:ECCODES_SAMPLE_PATH="$env:CONDA_PREFIX\Library\share\eccodes\samples"
......@@ -925,7 +935,7 @@ tests win epct-restapi:
- $env:GDAL_DATA="$env:CONDA_PREFIX\Library\share\gdal"
- $env:GDAL_DRIVER_PATH="$env:CONDA_PREFIX\Library\lib\gdalplugins"
- $env:GDAL_VRT_ENABLE_PYTHON="YES"
- $env:PYTHONSO="python36"
- $env:PYTHONSO="python39"
- gci env:* | sort-object name
- epct info
- cd epct-restapi\tests
......@@ -947,6 +957,7 @@ tests win proc validation:
EPCT_TEST_DATA_DIR: C:\data\data-tailor
dependencies:
- build win core
- build win gdal
- build win plugin-gis
stage: test_proc
tags:
......@@ -956,27 +967,26 @@ tests win proc validation:
when: runner_system_failure
needs:
- build win core
- build win gdal
- build win plugin-gis
- tests win validation
script:
- $env:Path = "$env:CONDABIN;$env:Path"
- $env:EPCT_TEST_DATA_DIR = "C:\BuildTools\test-data"
- if(!(Test-Path -Path $env:CI_PROJECT_DIR\conda-channel)){New-Item -ItemType directory -Path $env:CI_PROJECT_DIR\conda-channel}
- conda index $env:CI_PROJECT_DIR\conda-channel
- $env:CI_JOB_ID
- conda create --name $env:CI_JOB_ID python=3.6 pytest pytest-cov
- conda create --name $env:CI_JOB_ID python=3.9 pytest pytest-cov
- if (Test-Path -Path C:\Users\Admin\) {invoke-expression -Command C:\Users\Admin\Documents\WindowsPowerShell\profile.ps1}
- if (Test-Path -Path C:\Users\datatailor_admin\) {invoke-expression -Command $profile}
- if (Test-Path -Path C:\Users\datatailor_admin\) {invoke-expression -Command C:\Users\datatailor_admin\Documents\WindowsPowerShell\Microsoft.PowerShell_profile}
- conda activate $env:CI_JOB_ID
- conda env list
- conda install -y --override-channels -c defaults -c conda-forge -c $env:CI_PROJECT_DIR\conda-channel epct epct_restapi epct_plugin_gis
- conda install -c eumetsat msg-gdal-driver
- conda install -y --override-channels -c defaults -c conda-forge -c $env:CI_PROJECT_DIR\conda-channel epct epct_restapi epct_plugin_gis msg-gdal-driver
- $env:ECCODES_SAMPLE_PATH="$env:CONDA_PREFIX\Library\share\eccodes\samples"
- $env:ECCODES_DEFINITION_PATH="$env:CONDA_PREFIX\Library\share\eccodes\definitions"
- $env:GDAL_DATA="$env:CONDA_PREFIX\Library\share\gdal"
- $env:GDAL_DRIVER_PATH="$env:CONDA_PREFIX\Library\lib\gdalplugins"
- $env:GDAL_VRT_ENABLE_PYTHON="YES"
- $env:PYTHONSO="python36"
- $env:PYTHONSO="python39"
- gci env:* | sort-object name
- epct info
- pip install --no-deps --ignore-installed falcon_multipart
......
......@@ -4,6 +4,14 @@ All notable changes to this project are documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased]
### Changed
- Migrate Python version to 3.9 in view of version 3.6 end-of-life (#814, #1063)
- Natively compile PublicDecompWT during msg-gdal-driver windows build (#1007)
- Upgraded GDAL version to 3.3.1 (#1007)
## [2.15.1]
### Changed
......
......@@ -8,7 +8,7 @@ The branching and release workflow is very close to GitFlow.
The following main branches always exist:
* the **master** branch contains released software. Only the repository maintainer can merge to it.
* the **main** branch contains released software. Only the repository maintainer can merge to it.
* the **development** branch contains consolidated software developments.
When a developer wants to work on a new feature or a major bugfix, he needs to:
......@@ -49,7 +49,6 @@ customisation described in the [pyproject.toml](pyproject.toml) file.
To avoid code-style degradation it is recommended to use [pre-commit](https://pre-commit.com/)
(the configuration is provided in the [.pre-commit-config.yaml](.pre-commit-config.yaml) file).
#### Guideline for functional/validation tests
Please, follow these guidelines for writing functional or validation tests:
......
......@@ -52,7 +52,7 @@ Installation
Start by creating a new `conda` environment. Let's call it `epct-2.5`, but
any valid name would do (change the following instructions accordingly)::
conda create -n epct-2.5 python=3.6
conda create -n epct-2.5 python=3.9
Activate the environment::
......@@ -125,7 +125,7 @@ Installation
Start by creating a new `conda` environment. Let's call it `epct-2.5`, but
any valid name would do (change the following instructions accordingly)::
conda create -n epct-2.5 python=3.6
conda create -n epct-2.5 python=3.9
Activate the environment::
......
......@@ -90,9 +90,10 @@ EPS Native products
- It is impossible to perform re-projection and ROI-extraction for this product.
* - IASISND02 (EO:EUM:DAT:METOP:IASSND02)
- Only conversion to NetCDF4 file format is supported. Even if HNO3 and/or O3 data are present
in the EPS-native format, the NetCDF4 output file includes only datasets about CO data,
according to the corresponding product disseminated via Eumetsat DataCentre.
- Only product format version 11 is supported (>=2014-10-01). Only conversion to NetCDF4 file
format is supported. Even if HNO3 and/or O3 data are present in the EPS-native format, the
NetCDF4 output file includes only datasets about CO data, according to the corresponding
product disseminated via Eumetsat DataCentre.
Metop products
''''''''''''''
......
......@@ -19,16 +19,16 @@ RUN groupadd --gid $GROUP_ID user
RUN adduser -c '' --uid $USER_ID --gid $GROUP_ID user
USER user
RUN conda create --name dtws python=3.6
RUN conda create --name dtws python=3.9
RUN ls /mnt/conda-channel
RUN conda init bash && source ~/.bashrc && conda activate dtws && \
conda install -y $CHANNEL_OPTS \
epct \
epct_restapi \
epct_webui \
epct_plugin_gis \
epct_plugin_umarf \
epct_plugin_netcdf_generator \
msg-gdal-driver && \
conda clean --all --yes && \
pip install --no-deps --ignore-installed falcon_multipart
conda install -y $CHANNEL_OPTS \
epct \
epct_restapi \
epct_webui \
epct_plugin_gis \
epct_plugin_umarf \
epct_plugin_netcdf_generator \
msg-gdal-driver && \
conda clean --all --yes && \
pip install --no-deps --ignore-installed falcon_multipart
......@@ -101,7 +101,7 @@ services:
context: .
args:
CONDA_CHANNEL_DIR: ${CONDA_CHANNEL_DIR}
command: conda run --no-capture-output -n dtws dask-worker dtws-scheduler:8786 --nprocs=${N_WORKER_CORES} --nthreads 1 --memory-limit=4GB
command: conda run --no-capture-output -n dtws dask-worker dtws-scheduler:8786 --nprocs=${N_WORKER_CORES} --nthreads 1 --memory-limit=4GB --local-directory ~/worker-space
environment:
- DASK_DISTRIBUTED__COMM__TIMEOUTS__CONNECT=1m
volumes:
......
......@@ -10,14 +10,14 @@ RUN conda update -n base -c defaults conda && \
ARG CONDA_CHANNEL_DIR=conda-channel
ADD $CONDA_CHANNEL_DIR /mnt/conda-channel
RUN conda index /mnt/conda-channel
RUN conda create --name umarf python=3.6
RUN conda create --name umarf python=3.9
RUN conda init bash && source ~/.bashrc && conda activate umarf && \
conda install -y $CHANNEL_OPTS \
epct \
epct_restapi \
epct_plugin_gis \
msg-gdal-driver \
epct_plugin_netcdf_generator \
epct_plugin_umarf && \
conda clean --all --yes && \
pip install --no-deps --ignore-installed falcon_multipart
\ No newline at end of file
conda install -y $CHANNEL_OPTS \
epct \
epct_restapi \
epct_plugin_gis \
msg-gdal-driver \
epct_plugin_netcdf_generator \
epct_plugin_umarf && \
conda clean --all --yes && \
pip install --no-deps --ignore-installed falcon_multipart
\ No newline at end of file
--- msg_original/PublicDecompWT/DISE/CxRITFileHeaderRecords.cpp 2017-10-23 12:01:08.000000000 +0200
+++ msg/PublicDecompWT/DISE/CxRITFileHeaderRecords.cpp 2019-03-06 17:40:55.191635000 +0100
@@ -476,12 +476,12 @@
case e_ImageDataFunction :
{
- /*
+#ifdef WIN32
for (unsigned int i = 0; i < m_DataDefinitionBlock.size(); ++i)
i_Stream << m_DataDefinitionBlock[i];
- */
-#ifdef WIN32
- i_Stream.write(m_DataDefinitionBlock.begin(),m_DataDefinitionBlock.size());
+
+
+ /*i_Stream.write(m_DataDefinitionBlock.begin(),m_DataDefinitionBlock.size()); */
#else
i_Stream.write(m_DataDefinitionBlock.begin().base(),m_DataDefinitionBlock.size());
#endif
--- original/PublicDecompWTMakefiles/COMP/Src/makefile.vc 2005-03-02 17:59:04.000000000 +0100
+++ new/PublicDecompWTMakefiles/COMP/Src/makefile.vc 2019-03-06 17:39:02.597885000 +0100
@@ -1,11 +1,9 @@
OBJ = CBuffer.obj CImage.obj CQualityMeasures.obj
-EXTRAFLAGS = -I..\Inc -I..\..\DISE -D"WIN32"
-
-GDAL_ROOT = ..\..\..\..\..
-
-!INCLUDE $(GDAL_ROOT)\nmake.opt
+EXTRAFLAGS = /EHsc -I..\Inc -I..\..\DISE -D"WIN32"
+CFLAGS = $(EXTRAFLAGS)
+CPPFLAGS = $(CFLAGS) -DNOMINMAX
default: $(OBJ)
copy *.obj ..\..\..\..\o
--- original/PublicDecompWTMakefiles/COMP/WT/Src/makefile.vc 2005-03-02 17:59:54.000000000 +0100
+++ new/PublicDecompWTMakefiles/COMP/WT/Src/makefile.vc 2019-03-06 17:38:57.660385000 +0100
@@ -1,11 +1,12 @@
OBJ = CACCoder.obj CACDecoder.obj CACModel.obj CVLCCoder.obj CVLCDecoder.obj CWBlock.obj CWTCoder.obj CWTDecoder.obj CompressWT.obj
-EXTRAFLAGS = -I..\Inc -I..\..\Inc -I..\..\..\DISE -D"WIN32"
+EXTRAFLAGS = /EHsc -I..\Inc -I..\..\Inc -I..\..\..\DISE -D"WIN32" -I .
+CFLAGS = $(EXTRAFLAGS)
+CPPFLAGS = $(CFLAGS) -DNOMINMAX
GDAL_ROOT = ..\..\..\..\..\..
-!INCLUDE $(GDAL_ROOT)\nmake.opt
default: $(OBJ)
copy *.obj ..\..\..\..\..\o
--- original/PublicDecompWTMakefiles/DISE/makefile.vc 2005-03-02 17:57:44.000000000 +0100
+++ new/PublicDecompWTMakefiles/DISE/makefile.vc 2019-03-06 17:38:52.394760000 +0100
@@ -1,11 +1,10 @@
OBJ = CxRITFile.obj CxRITFileHeaderRecords.obj CxRITAnnotation.obj ErrorHandling.obj
-EXTRAFLAGS = -D"WIN32"
+EXTRAFLAGS = /EHsc -D"WIN32"
+CFLAGS = $(EXTRAFLAGS)
+CPPFLAGS = $(CFLAGS) -DNOMINMAX
-GDAL_ROOT = ..\..\..\..
-
-!INCLUDE $(GDAL_ROOT)\nmake.opt
default: $(OBJ)
copy *.obj ..\..\..\o
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment