From 01526134a3ad3da0241ac5ae91177b5136b3a648 Mon Sep 17 00:00:00 2001 From: Jacob van der Leeuw Date: Wed, 13 Jan 2021 10:51:27 -0700 Subject: [PATCH 01/11] changed ubuntu version to 20.04 --- .github/workflows/testing_checks.yaml | 6 +++--- Dockerfile | 15 ++++++++------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/testing_checks.yaml b/.github/workflows/testing_checks.yaml index a8f225e..a3bf52e 100644 --- a/.github/workflows/testing_checks.yaml +++ b/.github/workflows/testing_checks.yaml @@ -30,10 +30,10 @@ jobs: steps: - name: Current python version run: python3 --version || echo python3 not installed - - name: Install Python 3.7 + - name: Install Python 3.8 uses: actions/setup-python@v2 with: - python-version: '3.7' + python-version: '3.8' - name: Updated python version run: python3 --version - name: PYTHONPATH environment variable @@ -50,7 +50,7 @@ jobs: run: find . -type f -name "*.py" > action_test_files.txt - name: Install system requirements shell: bash - run: 'sudo apt-get install -y python3-gdal gdal-bin libgdal-dev gcc g++ python3.7-dev' + run: 'sudo apt-get install -y python3-gdal gdal-bin libgdal-dev gcc g++ python3.8-dev' - name: Install Python numpy shell: bash run: 'python3 -m pip install --upgrade --no-cache-dir numpy wheel' diff --git a/Dockerfile b/Dockerfile index 0d9a4cf..6c52960 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,6 @@ -FROM ubuntu:18.04 +FROM ubuntu:20.04 LABEL maintainer="Chris Schnaufer " +ENV DEBIAN_FRONTEND noninteractive # Add user RUN useradd -u 49044 extractor \ @@ -11,11 +12,11 @@ RUN chown -R extractor /home/extractor \ RUN apt-get update && \ apt-get upgrade -y && \ apt-get install -y --no-install-recommends \ - python3.7 \ + python3.8 \ python3-pip && \ - ln -sfn /usr/bin/python3.7 /usr/bin/python && \ - ln -sfn /usr/bin/python3.7 /usr/bin/python3 && \ - ln -sfn /usr/bin/python3.7m /usr/bin/python3m && \ + ln -sfn /usr/bin/python3.8 /usr/bin/python && \ + ln -sfn /usr/bin/python3.8 /usr/bin/python3 && \ + ln -sfn /usr/bin/python3.8m /usr/bin/python3m && \ apt-get autoremove -y && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* @@ -32,13 +33,13 @@ RUN apt-get update && \ libgdal-dev \ gcc \ g++ \ - python3.7-dev && \ + python3.8-dev && \ python3 -m pip install --upgrade --no-cache-dir \ wheel && \ python3 -m pip install --upgrade --no-cache-dir \ numpy && \ python3 -m pip install --upgrade --no-cache-dir \ - pygdal==2.2.3.* && \ + pygdal==3.0.4.* && \ apt-get remove -y \ libgdal-dev \ gcc \ From a9d70cfb8e133e59fc8ef63df1cde1770af90248 Mon Sep 17 00:00:00 2001 From: Jacob van der Leeuw Date: Wed, 3 Feb 2021 10:45:38 -0700 Subject: [PATCH 02/11] testing --- .DS_Store | Bin 0 -> 6148 bytes .github/workflows/testing_checks.yaml | 4 ++++ .github/workflows/testing_docker.yaml | 4 ++-- Dockerfile | 4 ++++ 4 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..256c925d688c2e1ecfdf43fe9ed89599938886ca GIT binary patch literal 6148 zcmeHKyG{c!5FA4g386>_<&{*CsA-On6p?^}`~Z0zDB|(}5(&C%_y>N0@8bhtc5Ov> zm!v{M2<=Miv3)yd@7Ow@0l3z3bP6;8ROx~{H5MC8o{O*9PUw+`PTw)cJ(hSvAB(kU z>-dWb_{AS$hAHllU%#>TH8IC)H=PX!>1@CRWTTwXPrlSNr317XJH!JLuD!e^MN;B? zlsNmiL>Cw6;2J%2iqY<<6n)59^mT+jcUXdFG`YiGuqg39OT0RHDd)BzH|4zMMptJXbQX$qJEroc)8`94H+!8l;%Q9m6l^a?<%uv?9F`9%~?6fh2$ zdE^tC^Hidzx^TsCp3eR##Ki$KkDd+}E*~z8?7|Jj>F9iaq~UO}M=MPMQ=q88u5UKv z{O@eP{})NtG6hV5f2Dw{w0rFqQwnG6T5@vMM)X^{n8alsR}@zCC}yl2#m96t_D517 V#sM>r?4j9@fXZNnDe$Wbd;_c(ex3jT literal 0 HcmV?d00001 diff --git a/.github/workflows/testing_checks.yaml b/.github/workflows/testing_checks.yaml index a3bf52e..abaf361 100644 --- a/.github/workflows/testing_checks.yaml +++ b/.github/workflows/testing_checks.yaml @@ -4,6 +4,7 @@ on: branches: - master - develop + - ubuntu20.04 pull_request: branches: - master @@ -63,6 +64,9 @@ jobs: - name: Install Python requirements from source shell: bash run: '[ -s "requirements.txt" ] && (python3 -m pip install --no-cache-dir -r requirements.txt) || (echo "Failed to install Python requirements" && exit 1)' + - name: Install testpypi agpypeline + shell: bash + run: 'python3 -m pip install --upgrade --no-cache-dir --index-url https://test.pypi.org/simple/ agpypeline==0.0.106' - name: Run action pylint script shell: bash run: '[ -s ".github/workflows/action_pylint.sh" ] && (chmod +x ".github/workflows/action_pylint.sh" && ./.github/workflows/action_pylint.sh) || (echo "Error running shell script" && exit 1)' diff --git a/.github/workflows/testing_docker.yaml b/.github/workflows/testing_docker.yaml index 86292c8..0ececbc 100644 --- a/.github/workflows/testing_docker.yaml +++ b/.github/workflows/testing_docker.yaml @@ -17,10 +17,10 @@ jobs: runs-on: ubuntu-latest name: Running Docker testing steps: - - name: Install Python 3.7 + - name: Install Python 3.8 uses: actions/setup-python@v2 with: - python-version: '3.7' + python-version: '3.8' - name: Fetch source code uses: actions/checkout@v2 - name: Build docker image diff --git a/Dockerfile b/Dockerfile index 6c52960..bc4e213 100644 --- a/Dockerfile +++ b/Dockerfile @@ -74,8 +74,12 @@ RUN [ -s /home/extractor/requirements.txt ] && \ (echo "No python modules to install" && \ rm /home/extractor/requirements.txt) +RUN (echo "Installing agpypeline from testpypi" && \ + python3 -m pip install --upgrade --no-cache-dir --index-url https://test.pypi.org/simple/ agpypeline==0.0.106) + USER extractor COPY configuration.py plotclip.py /home/extractor/ +COPY tests /home/extractor/tests USER root RUN chmod a+x /home/extractor/plotclip.py From aa371f4c702459aae909db8c6ee90b941e901978 Mon Sep 17 00:00:00 2001 From: Jacob van der Leeuw Date: Thu, 4 Feb 2021 10:57:41 -0700 Subject: [PATCH 03/11] changed agpypeline install for the moment; will be removed once new agpypeline is put into place --- .github/workflows/testing_checks.yaml | 2 +- Dockerfile | 2 +- requirements.txt | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/testing_checks.yaml b/.github/workflows/testing_checks.yaml index abaf361..93d228e 100644 --- a/.github/workflows/testing_checks.yaml +++ b/.github/workflows/testing_checks.yaml @@ -66,7 +66,7 @@ jobs: run: '[ -s "requirements.txt" ] && (python3 -m pip install --no-cache-dir -r requirements.txt) || (echo "Failed to install Python requirements" && exit 1)' - name: Install testpypi agpypeline shell: bash - run: 'python3 -m pip install --upgrade --no-cache-dir --index-url https://test.pypi.org/simple/ agpypeline==0.0.106' + run: 'python3 -m pip install --upgrade --no-cache-dir --index-url https://test.pypi.org/simple/ agpypeline==0.0.110' - name: Run action pylint script shell: bash run: '[ -s ".github/workflows/action_pylint.sh" ] && (chmod +x ".github/workflows/action_pylint.sh" && ./.github/workflows/action_pylint.sh) || (echo "Error running shell script" && exit 1)' diff --git a/Dockerfile b/Dockerfile index bc4e213..ade736c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -75,7 +75,7 @@ RUN [ -s /home/extractor/requirements.txt ] && \ rm /home/extractor/requirements.txt) RUN (echo "Installing agpypeline from testpypi" && \ - python3 -m pip install --upgrade --no-cache-dir --index-url https://test.pypi.org/simple/ agpypeline==0.0.106) + python3 -m pip install --upgrade --no-cache-dir --index-url https://test.pypi.org/simple/ agpypeline==0.0.110) USER extractor COPY configuration.py plotclip.py /home/extractor/ diff --git a/requirements.txt b/requirements.txt index 6c96900..0c74557 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ liblas dbfread -agpypeline \ No newline at end of file +agpypeline +pytest \ No newline at end of file From 1b45e2fca1c2b0edefa6e23c0f20eb2c027717e2 Mon Sep 17 00:00:00 2001 From: Jacob van der Leeuw Date: Thu, 4 Feb 2021 11:01:08 -0700 Subject: [PATCH 04/11] changed agpypeline install for the moment; will be removed once new agpypeline is put into place --- requirements.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 0c74557..6c96900 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,3 @@ liblas dbfread -agpypeline -pytest \ No newline at end of file +agpypeline \ No newline at end of file From 19c4ae741f378814e2d3e2ea74d393d37f9fcf9f Mon Sep 17 00:00:00 2001 From: Chris Schnaufer Date: Tue, 16 Feb 2021 10:08:08 -0700 Subject: [PATCH 05/11] Updating for Ubuntu20.04 & agpypeline --- .github/workflows/testing_checks.yaml | 6 +----- Dockerfile | 4 ---- plotclip.py | 11 ++++++----- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/.github/workflows/testing_checks.yaml b/.github/workflows/testing_checks.yaml index 93d228e..9516926 100644 --- a/.github/workflows/testing_checks.yaml +++ b/.github/workflows/testing_checks.yaml @@ -4,7 +4,6 @@ on: branches: - master - develop - - ubuntu20.04 pull_request: branches: - master @@ -57,16 +56,13 @@ jobs: run: 'python3 -m pip install --upgrade --no-cache-dir numpy wheel' - name: Install Python pygdal shell: bash - run: 'python3 -m pip install --no-cache-dir pygdal==2.2.3.5' + run: 'python3 -m pip install --no-cache-dir pygdal==3.0.4.*' - name: Install system requirements from source shell: bash run: '[ -s "packages.txt" ] && (cat packages.txt | sudo xargs apt-get install -y --no-install-recommends) || (echo "Failed to install additional packages" && exit 1)' - name: Install Python requirements from source shell: bash run: '[ -s "requirements.txt" ] && (python3 -m pip install --no-cache-dir -r requirements.txt) || (echo "Failed to install Python requirements" && exit 1)' - - name: Install testpypi agpypeline - shell: bash - run: 'python3 -m pip install --upgrade --no-cache-dir --index-url https://test.pypi.org/simple/ agpypeline==0.0.110' - name: Run action pylint script shell: bash run: '[ -s ".github/workflows/action_pylint.sh" ] && (chmod +x ".github/workflows/action_pylint.sh" && ./.github/workflows/action_pylint.sh) || (echo "Error running shell script" && exit 1)' diff --git a/Dockerfile b/Dockerfile index ade736c..6c52960 100644 --- a/Dockerfile +++ b/Dockerfile @@ -74,12 +74,8 @@ RUN [ -s /home/extractor/requirements.txt ] && \ (echo "No python modules to install" && \ rm /home/extractor/requirements.txt) -RUN (echo "Installing agpypeline from testpypi" && \ - python3 -m pip install --upgrade --no-cache-dir --index-url https://test.pypi.org/simple/ agpypeline==0.0.110) - USER extractor COPY configuration.py plotclip.py /home/extractor/ -COPY tests /home/extractor/tests USER root RUN chmod a+x /home/extractor/plotclip.py diff --git a/plotclip.py b/plotclip.py index 1ba4d32..611f81d 100755 --- a/plotclip.py +++ b/plotclip.py @@ -14,6 +14,7 @@ import numpy as np from agpypeline import algorithm, entrypoint, geometries, geoimage, lasfile from agpypeline.environment import Environment +from agpypeline.checkmd import CheckMD from osgeo import gdal, ogr, osr from configuration import ConfigurationPlotclip @@ -299,7 +300,7 @@ def calculate_overlap_percent(check_bounds: ogr.Geometry, other_bounds: ogr.Geom return 0.0 @staticmethod - def cleanup_request_md(source_md: dict) -> dict: + def cleanup_request_md(source_md: CheckMD) -> dict: """Makes a copy of the source metadata and cleans it up for use as plot-level information Arguments: source_md: the source metadata to clone and clean up @@ -517,7 +518,7 @@ def add_parameters(self, parser: argparse.ArgumentParser) -> None: help='the name of the column in the plot geometry file containing plot names') parser.add_argument('plot_file', type=str, help='the path of the GeoJSON file to use for plot boundaries') - def perform_process(self, environment: Environment, check_md: dict, transformer_md: dict, full_md: list) -> dict: + def perform_process(self, environment: Environment, check_md: CheckMD, transformer_md: dict, full_md: list) -> dict: """Performs the processing of the data Arguments: environment: instance of environment class @@ -532,7 +533,7 @@ def perform_process(self, environment: Environment, check_md: dict, transformer_ processed_files = 0 processed_plots = 0 start_timestamp = datetime.datetime.now() - file_list = check_md['list_files']() + file_list = check_md.get_list_files() files_to_process = __internal__.get_files_to_process(file_list, environment.args.epsg) logging.info("Found %s files to process", str(len(files_to_process))) @@ -567,7 +568,7 @@ def perform_process(self, environment: Environment, check_md: dict, transformer_ if filename.endswith('.tif'): # If file is a geoTIFF, simply clip it - out_path = os.path.join(check_md['working_folder'], plot_name) + out_path = os.path.join(check_md.working_folder, plot_name) out_file = os.path.join(out_path, filename) __internal__.clip_tiff(file_path, file_bounds, plot_bounds, out_file, environment.args.full_plot_fill) @@ -579,7 +580,7 @@ def perform_process(self, environment: Environment, check_md: dict, transformer_ elif filename.endswith('.las'): tuples = geometries.geometry_to_tuples(plot_bounds) - out_path = os.path.join(check_md['working_folder'], plot_name) + out_path = os.path.join(check_md.working_folder, plot_name) out_file = os.path.join(out_path, filename) __internal__.clip_las(file_path, tuples, out_file) From a977fd0dc1e5a495f2b7cd75dd0cf019ea4ed82e Mon Sep 17 00:00:00 2001 From: Chris Schnaufer Date: Wed, 17 Feb 2021 10:28:52 -0700 Subject: [PATCH 06/11] Actions testing Ububtu 20.04 --- .github/workflows/testing_checks.yaml | 3 ++- .github/workflows/testing_docker.yaml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/testing_checks.yaml b/.github/workflows/testing_checks.yaml index 9516926..24a7521 100644 --- a/.github/workflows/testing_checks.yaml +++ b/.github/workflows/testing_checks.yaml @@ -4,6 +4,7 @@ on: branches: - master - develop + - ubuntu20.04 pull_request: branches: - master @@ -14,7 +15,7 @@ on: jobs: testing: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 name: Running testing strategy: matrix: diff --git a/.github/workflows/testing_docker.yaml b/.github/workflows/testing_docker.yaml index 0ececbc..8e40e93 100644 --- a/.github/workflows/testing_docker.yaml +++ b/.github/workflows/testing_docker.yaml @@ -4,6 +4,7 @@ on: branches: - master - develop + - ubuntu20.04 pull_request: branches: - master From dcbe3764eebcd4b7a3d7cb24835f978c86d0ec4a Mon Sep 17 00:00:00 2001 From: Chris Schnaufer Date: Wed, 17 Feb 2021 10:43:49 -0700 Subject: [PATCH 07/11] Removed old installs --- packages.txt | 1 - requirements.txt | 1 - 2 files changed, 2 deletions(-) diff --git a/packages.txt b/packages.txt index 581a89c..f71c23f 100644 --- a/packages.txt +++ b/packages.txt @@ -1,2 +1 @@ pdal -liblas-bin \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 6c96900..ebb8c57 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,2 @@ -liblas dbfread agpypeline \ No newline at end of file From 31660da38f4a54a1fd0895677004d015074a4334 Mon Sep 17 00:00:00 2001 From: Chris Schnaufer Date: Wed, 17 Feb 2021 10:56:14 -0700 Subject: [PATCH 08/11] Updated for new AgPypeline library --- plotclip.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/plotclip.py b/plotclip.py index 611f81d..a04539c 100755 --- a/plotclip.py +++ b/plotclip.py @@ -310,10 +310,14 @@ def cleanup_request_md(source_md: CheckMD) -> dict: if not source_md: return {} - new_md = copy.deepcopy(source_md) - new_md.pop('list_files', None) - new_md.pop('context_md', None) - new_md.pop('working_folder', None) + new_md = { + 'timestamp': source_md.timestamp, + 'season': source_md.season, + 'experiment': source_md.experiment, + 'container_name': source_md.container_name, + 'target_container_name': source_md.target_container_name, + 'trigger_name': source_md.trigger_name + } return new_md From ea2d95a84a3add1878638c9d0417417aa393caa6 Mon Sep 17 00:00:00 2001 From: Chris Schnaufer Date: Wed, 17 Feb 2021 11:14:55 -0700 Subject: [PATCH 09/11] Fixing Action checks --- .github/workflows/check_plotclip_details.py | 36 +++++++++++++++++++-- .github/workflows/testing_docker.yaml | 6 ++++ plotclip.py | 1 - 3 files changed, 39 insertions(+), 4 deletions(-) diff --git a/.github/workflows/check_plotclip_details.py b/.github/workflows/check_plotclip_details.py index f95461c..82b946d 100644 --- a/.github/workflows/check_plotclip_details.py +++ b/.github/workflows/check_plotclip_details.py @@ -4,6 +4,8 @@ import argparse import os +import PIL.Image +import numpy as np import subprocess # The default file extension to look for @@ -34,6 +36,30 @@ def get_arguments() -> argparse.Namespace: return args +def check_images(first_path: str, second_path: str) -> None: + """Compares the two image files and throws an exception if they don't match + Arguments: + first_path: the path to the first file to compare + second_path: the path to the second file to compare + """ + first_pixels = PIL.Image.open(first_path) + first_array = np.array(first_pixels) + del first_pixels + + second_pixels = PIL.Image.open(second_path) + second_array = np.array(second_pixels) + del second_pixels + + if first_array.shape != second_array.shape: + raise RuntimeError("Image dimensions are different: %s vs %s" % (str(first_array.shape), str(second_array.shape))) + + for i in range(0, first_array.shape[0]): + for j in range(0, first_array.shape[1]): + for k in range(0, first_array.shape[2]): + if first_array[i][j][k] - second_array[i][j][k] != 0: + raise RuntimeError("Image pixels are different. First difference at %s %s %s" % (str(i), str(j), str(k))) + + def compare_file_contents(source_file: str, compare_file: str) -> bool: """Compares the source file against the comparison file for differences Arguments: @@ -42,9 +68,13 @@ def compare_file_contents(source_file: str, compare_file: str) -> bool: Returns: Returns True if the files are considered the same, and False if they are not """ - cmd = ['diff', '--brief', source_file, compare_file] - res = subprocess.run(cmd, capture_output=True, check=True) - return len(res.stdout) == 0 + if (os.path.splitext(source_file)[1]).lower() in ['.tif', '.tiff']: + check_images(source_file, compare_file) + return True + else: + cmd = ['diff', '--brief', source_file, compare_file] + res = subprocess.run(cmd, capture_output=True, check=True) + return len(res.stdout) == 0 def find_compare_files(truth_folder: str, compare_folder: str, file_ext: str, check_subfolders: bool = True) -> None: diff --git a/.github/workflows/testing_docker.yaml b/.github/workflows/testing_docker.yaml index 8e40e93..f5d0632 100644 --- a/.github/workflows/testing_docker.yaml +++ b/.github/workflows/testing_docker.yaml @@ -22,6 +22,12 @@ jobs: uses: actions/setup-python@v2 with: python-version: '3.8' + - name: Updated python version + run: python3 --version + - name: Install python dependencies + run: | + python3 -m pip install -U pip + python3 -m pip install -U numpy Pillow - name: Fetch source code uses: actions/checkout@v2 - name: Build docker image diff --git a/plotclip.py b/plotclip.py index a04539c..bf5ad5a 100755 --- a/plotclip.py +++ b/plotclip.py @@ -3,7 +3,6 @@ """ import argparse -import copy import datetime import json import logging From e5675f7f03008b2776bfd360b16aeb29ef70ed10 Mon Sep 17 00:00:00 2001 From: Chris Schnaufer Date: Wed, 17 Feb 2021 13:20:39 -0700 Subject: [PATCH 10/11] Added status message --- .github/workflows/check_plotclip_details.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/check_plotclip_details.py b/.github/workflows/check_plotclip_details.py index 82b946d..5bac809 100644 --- a/.github/workflows/check_plotclip_details.py +++ b/.github/workflows/check_plotclip_details.py @@ -4,9 +4,9 @@ import argparse import os +import subprocess import PIL.Image import numpy as np -import subprocess # The default file extension to look for DEFAULT_FILE_EXT = '.tif' @@ -71,10 +71,10 @@ def compare_file_contents(source_file: str, compare_file: str) -> bool: if (os.path.splitext(source_file)[1]).lower() in ['.tif', '.tiff']: check_images(source_file, compare_file) return True - else: - cmd = ['diff', '--brief', source_file, compare_file] - res = subprocess.run(cmd, capture_output=True, check=True) - return len(res.stdout) == 0 + + cmd = ['diff', '--brief', source_file, compare_file] + res = subprocess.run(cmd, capture_output=True, check=True) + return len(res.stdout) == 0 def find_compare_files(truth_folder: str, compare_folder: str, file_ext: str, check_subfolders: bool = True) -> None: @@ -105,6 +105,7 @@ def find_compare_files(truth_folder: str, compare_folder: str, file_ext: str, ch # Check truth folder for matching files and sub-folders for one_file in os.listdir(cur_truth): if os.path.splitext(one_file)[1].lower() == check_ext: + print("Checking file:", os.path.join(cur_truth, one_file)) if not os.path.exists(os.path.join(cur_compare, one_file)): raise RuntimeError('Unable to find expected file "%s"' % os.path.join(cur_subpath, one_file)) if not compare_file_contents(os.path.join(cur_truth, one_file), os.path.join(cur_compare, one_file)): From b84a8b24db5448aa9fa3c9e2664d260e4f87bc37 Mon Sep 17 00:00:00 2001 From: Chris Schnaufer Date: Wed, 17 Feb 2021 13:27:40 -0700 Subject: [PATCH 11/11] Ready for merge --- .DS_Store | Bin 6148 -> 0 bytes .github/workflows/testing_checks.yaml | 1 - .github/workflows/testing_docker.yaml | 1 - 3 files changed, 2 deletions(-) delete mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 256c925d688c2e1ecfdf43fe9ed89599938886ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKyG{c!5FA4g386>_<&{*CsA-On6p?^}`~Z0zDB|(}5(&C%_y>N0@8bhtc5Ov> zm!v{M2<=Miv3)yd@7Ow@0l3z3bP6;8ROx~{H5MC8o{O*9PUw+`PTw)cJ(hSvAB(kU z>-dWb_{AS$hAHllU%#>TH8IC)H=PX!>1@CRWTTwXPrlSNr317XJH!JLuD!e^MN;B? zlsNmiL>Cw6;2J%2iqY<<6n)59^mT+jcUXdFG`YiGuqg39OT0RHDd)BzH|4zMMptJXbQX$qJEroc)8`94H+!8l;%Q9m6l^a?<%uv?9F`9%~?6fh2$ zdE^tC^Hidzx^TsCp3eR##Ki$KkDd+}E*~z8?7|Jj>F9iaq~UO}M=MPMQ=q88u5UKv z{O@eP{})NtG6hV5f2Dw{w0rFqQwnG6T5@vMM)X^{n8alsR}@zCC}yl2#m96t_D517 V#sM>r?4j9@fXZNnDe$Wbd;_c(ex3jT diff --git a/.github/workflows/testing_checks.yaml b/.github/workflows/testing_checks.yaml index 24a7521..40f07fc 100644 --- a/.github/workflows/testing_checks.yaml +++ b/.github/workflows/testing_checks.yaml @@ -4,7 +4,6 @@ on: branches: - master - develop - - ubuntu20.04 pull_request: branches: - master diff --git a/.github/workflows/testing_docker.yaml b/.github/workflows/testing_docker.yaml index f5d0632..c51fc1c 100644 --- a/.github/workflows/testing_docker.yaml +++ b/.github/workflows/testing_docker.yaml @@ -4,7 +4,6 @@ on: branches: - master - develop - - ubuntu20.04 pull_request: branches: - master