From ed4c9417eb441604f510f237d68463e993ca6f59 Mon Sep 17 00:00:00 2001 From: Julien Lerat Date: Tue, 24 Oct 2023 21:08:36 +1100 Subject: [PATCH 1/3] doc: removed bitbucket pipeline [ci-skip] --- bitbucket-pipelines.yml | 42 ----------------------------------------- 1 file changed, 42 deletions(-) delete mode 100644 bitbucket-pipelines.yml diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml deleted file mode 100644 index 09e5eeff..00000000 --- a/bitbucket-pipelines.yml +++ /dev/null @@ -1,42 +0,0 @@ -image: continuumio/miniconda3:latest - -pipelines: - branches: - '{master,cleanup}': - - step: - caches: - - pip - - conda - script: # Build env and run tests - - apt-get update && apt-get -y install build-essential - - conda env update -n diyenv --file env.yml - - source activate diyenv - - python setup.py develop - - # Running tests - - pytest --junitxml=junit/test-results.xml --cov=hydrodiy --cov-config=.coveragerc --cov-report=xml hydrodiy - - # Pylint - #pylint --rcfile pylintrc hydrodiy > pylint_results - - # Install hydrodiy - - python setup.py install - - # Running examples - - python -W ignore examples/run_all_examples.py - - # Get list of functions skipping files with basemap - - python -W ignore listmembers.py -s - - # Remove C modules and rerun tests - - rm -f *.so - - rm -rf build - - pytest --junitxml=junit/test-results.xml --cov=hydrodiy --cov-config=.coveragerc --cov-report=xml hydrodiy - - artifacts: - - cov_html_gridverif/** - -definitions: - caches: - conda: ~/.conda/envs/diyenv - From 67c15a4caf356c6198c4db6b15484e6e1c23931b Mon Sep 17 00:00:00 2001 From: Julien Lerat Date: Wed, 1 Nov 2023 09:34:00 +1100 Subject: [PATCH 2/3] chore: moved pipeline and created reduced conda env spec --- .../azure-pipelines.yml | 6 +++--- env_nriv_v2.yml => env_mini.yml | 14 +------------- 2 files changed, 4 insertions(+), 16 deletions(-) rename azure-pipelines.yml => .azure_devops/azure-pipelines.yml (93%) rename env_nriv_v2.yml => env_mini.yml (62%) mode change 100755 => 100644 diff --git a/azure-pipelines.yml b/.azure_devops/azure-pipelines.yml similarity index 93% rename from azure-pipelines.yml rename to .azure_devops/azure-pipelines.yml index 61f90303..99a7afe9 100644 --- a/azure-pipelines.yml +++ b/.azure_devops/azure-pipelines.yml @@ -11,7 +11,7 @@ strategy: python.version: '3.8' variables: - CONDA_ENV: env_nriv_v2 + CONDA_ENV: env_mini CONDA_HOME: /usr/share/miniconda/envs/$(CONDA_ENV)/ BUILD_DIR: $(System.DefaultWorkingDirectory) @@ -27,11 +27,11 @@ steps: - task: Cache@2 displayName: Use cached Anaconda environment inputs: - key: conda | env_nriv_v2.yml + key: conda | env_mini.yml path: $(CONDA_HOME) cacheHitVar: CONDA_CACHE_RESTORED -- bash: conda env create --file env_nriv_v2.yml +- bash: conda env create --file env_mini.yml displayName: Create Anaconda environment (if not restored from cache) condition: eq(variables.CONDA_CACHE_RESTORED, 'false') diff --git a/env_nriv_v2.yml b/env_mini.yml old mode 100755 new mode 100644 similarity index 62% rename from env_nriv_v2.yml rename to env_mini.yml index 1777c1e3..79d49899 --- a/env_nriv_v2.yml +++ b/env_mini.yml @@ -1,33 +1,21 @@ -name: env_nriv_v2 +name: env_mini channels: - conda-forge - defaults dependencies: - - cartopy - - cmdstanpy=1.0.6 - cython=0.29.32 - - gprof2dot - - gsl=2.7 - - graphviz - - h5py=3.7.0 - ipython - matplotlib=3.5.3 - - netcdf4=1.6.0 - numpy=1.23.2 - - openpyxl - pandas=1.4.3 - pip - pyepsg - pyproj - pyshp - - pytables=3.7.0 - pytest - pytest-cov - python=3.10.6 - - pytz - - rasterio - requests - - rpy2=3.5.1 - scipy=1.9.0 - tqdm - zarr=2.12.0 From 44457f4763298ddee97d1d6969db45fc080a9cef Mon Sep 17 00:00:00 2001 From: Julien Lerat Date: Tue, 13 Feb 2024 09:26:29 +1100 Subject: [PATCH 3/3] fix: lighter contextual logger comments --- hydrodiy/io/iutils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hydrodiy/io/iutils.py b/hydrodiy/io/iutils.py index ed9e6ab7..e2992e23 100644 --- a/hydrodiy/io/iutils.py +++ b/hydrodiy/io/iutils.py @@ -153,7 +153,7 @@ def context(self): def context(self, value): self._context = str(value) if self._context != "": - self.info(LOGGER_SEPARATOR*LOGGER_NSEPARATORS) + self.info("") sep = LOGGER_SEPARATOR_CONTEXTUAL\ *LOGGER_NSEPARATORS_CONTEXTUAL mess = sep+" "+self._context+" "+sep