From ea351a7b102b562083a2fa9e04ddfcb471a644e2 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 20 Feb 2023 17:59:04 +0000 Subject: [PATCH 1/2] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/pre-commit/pre-commit-hooks: v2.3.0 → v4.4.0](https://github.com/pre-commit/pre-commit-hooks/compare/v2.3.0...v4.4.0) - [github.com/PyCQA/isort: 5.9.2 → 5.12.0](https://github.com/PyCQA/isort/compare/5.9.2...5.12.0) - [github.com/PyCQA/flake8: 3.9.2 → 6.0.0](https://github.com/PyCQA/flake8/compare/3.9.2...6.0.0) - [github.com/PyCQA/bandit: 1.7.0 → 1.7.4](https://github.com/PyCQA/bandit/compare/1.7.0...1.7.4) - [github.com/PyCQA/pylint: v2.9.3 → v2.16.2](https://github.com/PyCQA/pylint/compare/v2.9.3...v2.16.2) --- .pre-commit-config.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a525022..308293a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,23 +1,23 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v2.3.0 + rev: v4.4.0 hooks: - id: check-yaml - id: end-of-file-fixer - id: trailing-whitespace - repo: https://github.com/PyCQA/isort - rev: 5.9.2 + rev: 5.12.0 hooks: - id: isort - repo: https://github.com/PyCQA/flake8 - rev: 3.9.2 + rev: 6.0.0 hooks: - id: flake8 - repo: https://github.com/PyCQA/bandit - rev: 1.7.0 + rev: 1.7.4 hooks: - id: bandit - repo: https://github.com/PyCQA/pylint - rev: v2.9.3 + rev: v2.16.2 hooks: - id: pylint From b35ec5e50550fa63786158362113f8688d71af3b Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 20 Feb 2023 17:59:14 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- LICENSE | 1 - docker-compose.yml | 1 - dump.sql | 1 - locust/Dockerfile | 2 +- locust/docker-compose.yaml | 2 +- locust/locustfile.py | 2 +- locust/request_data.xml | 2 +- setup-db.sh | 10 +++++----- 8 files changed, 9 insertions(+), 12 deletions(-) diff --git a/LICENSE b/LICENSE index 22201b6..2bdee53 100644 --- a/LICENSE +++ b/LICENSE @@ -9,4 +9,3 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - diff --git a/docker-compose.yml b/docker-compose.yml index 1ec77f8..fc99a7b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -31,4 +31,3 @@ services: - "8000:8000" volumes: - ./artifacts:/mnt/artifacts - diff --git a/dump.sql b/dump.sql index aaef542..512521e 100644 --- a/dump.sql +++ b/dump.sql @@ -1505,4 +1505,3 @@ ALTER TABLE ONLY agdc.dataset_type -- -- PostgreSQL database dump complete -- - diff --git a/locust/Dockerfile b/locust/Dockerfile index fbf80bb..3e8e7a3 100644 --- a/locust/Dockerfile +++ b/locust/Dockerfile @@ -6,4 +6,4 @@ RUN set -ex \ && pip install -r /requirements.txt EXPOSE 8089/tcp -CMD locust -f /mnt/locust/locustfile.py --config=/mnt/locust/locust.conf \ No newline at end of file +CMD locust -f /mnt/locust/locustfile.py --config=/mnt/locust/locust.conf diff --git a/locust/docker-compose.yaml b/locust/docker-compose.yaml index e1eadfd..747350c 100644 --- a/locust/docker-compose.yaml +++ b/locust/docker-compose.yaml @@ -13,4 +13,4 @@ services: build: . volumes: - ./:/mnt/locust - command: -f /mnt/locust/locustfile.py --worker --master-host master \ No newline at end of file + command: -f /mnt/locust/locustfile.py --worker --master-host master diff --git a/locust/locustfile.py b/locust/locustfile.py index 0e6f913..ec35bce 100755 --- a/locust/locustfile.py +++ b/locust/locustfile.py @@ -71,4 +71,4 @@ def get_test_data(): -# https://ows.dev.dea.ga.gov.au/wps/?service=WPS&request=Execute \ No newline at end of file +# https://ows.dev.dea.ga.gov.au/wps/?service=WPS&request=Execute diff --git a/locust/request_data.xml b/locust/request_data.xml index c822b6b..3e4f481 100644 --- a/locust/request_data.xml +++ b/locust/request_data.xml @@ -11,4 +11,4 @@ - \ No newline at end of file + diff --git a/setup-db.sh b/setup-db.sh index 9e9b36a..c31f673 100755 --- a/setup-db.sh +++ b/setup-db.sh @@ -19,12 +19,12 @@ if [ ! -f dump.sql ]; then stac () { curl -s "$index/stac/search?collections=$1&datetime=$2T00:00:00Z/$3T00:00:00Z&bbox=$4&limit=500" | jq '.features[].links[] | select(.rel == "odc_yaml") | .href'; } - + { - stac ga_ls_wo_3 2000-01-01 2001-01-01 "137.01,-28.76,137.02,-28.75" - + stac ga_ls_wo_3 2000-01-01 2001-01-01 "137.01,-28.76,137.02,-28.75" + stac "ga_ls8c_ard_3,ga_ls7e_ard_3,ga_ls_fc_3,ga_ls_wo_3" 2019-03-01 2019-08-01 "146.65,-36.16,147.29,-35.66" - + stac mangrove_cover 2000-01-01 2006-01-01 "143.98,-14.69,144.27,-14.39" } | xargs -L1 $cmd -v dataset add --confirm-ignore-lineage @@ -33,7 +33,7 @@ if [ ! -f dump.sql ]; then else - echo Reusing cache.. + echo Reusing cache.. docker-compose exec -T -u postgres postgres psql < dump.sql