From 434242a6fc129ac40d24aeff0a388f1fcf1a11ea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 26 Sep 2023 10:42:53 -0400 Subject: [PATCH 01/14] build(deps): bump pandas from 2.1.0 to 2.1.1 (#832) Bumps [pandas](https://github.com/pandas-dev/pandas) from 2.1.0 to 2.1.1. - [Release notes](https://github.com/pandas-dev/pandas/releases) - [Commits](https://github.com/pandas-dev/pandas/compare/v2.1.0...v2.1.1) --- updated-dependencies: - dependency-name: pandas dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 46 ++++++++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/requirements.txt b/requirements.txt index 281b1f8fd..735703ed8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -518,26 +518,32 @@ packaging==23.1 \ # via # geopandas # gunicorn -pandas==2.1.0 \ - --hash=sha256:0164b85937707ec7f70b34a6c3a578dbf0f50787f910f21ca3b26a7fd3363437 \ - --hash=sha256:28f330845ad21c11db51e02d8d69acc9035edfd1116926ff7245c7215db57957 \ - --hash=sha256:38f74ef7ebc0ffb43b3d633e23d74882bce7e27bfa09607f3c5d3e03ffd9a4a5 \ - --hash=sha256:40dd20439ff94f1b2ed55b393ecee9cb6f3b08104c2c40b0cb7186a2f0046242 \ - --hash=sha256:629124923bcf798965b054a540f9ccdfd60f71361255c81fa1ecd94a904b9dd3 \ - --hash=sha256:62c24c7fc59e42b775ce0679cfa7b14a5f9bfb7643cfbe708c960699e05fb918 \ - --hash=sha256:6e6a0fe052cf27ceb29be9429428b4918f3740e37ff185658f40d8702f0b3e09 \ - --hash=sha256:70cf866af3ab346a10debba8ea78077cf3a8cd14bd5e4bed3d41555a3280041c \ - --hash=sha256:86f100b3876b8c6d1a2c66207288ead435dc71041ee4aea789e55ef0e06408cb \ - --hash=sha256:9d81e1813191070440d4c7a413cb673052b3b4a984ffd86b8dd468c45742d3cc \ - --hash=sha256:b31da36d376d50a1a492efb18097b9101bdbd8b3fbb3f49006e02d4495d4c644 \ - --hash=sha256:b9a6ccf0963db88f9b12df6720e55f337447aea217f426a22d71f4213a3099a6 \ - --hash=sha256:cda72cc8c4761c8f1d97b169661f23a86b16fdb240bdc341173aee17e4d6cedd \ - --hash=sha256:d4f38e4fedeba580285eaac7ede4f686c6701a9e618d8a857b138a126d067f2f \ - --hash=sha256:d53c8c1001f6a192ff1de1efe03b31a423d0eee2e9e855e69d004308e046e694 \ - --hash=sha256:d8c58b1113892e0c8078f006a167cc210a92bdae23322bb4614f2f0b7a4b510f \ - --hash=sha256:d97daeac0db8c993420b10da4f5f5b39b01fc9ca689a17844e07c0a35ac96b4b \ - --hash=sha256:d99e678180bc59b0c9443314297bddce4ad35727a1a2656dbe585fd78710b3b9 \ - --hash=sha256:eb20252720b1cc1b7d0b2879ffc7e0542dd568f24d7c4b2347cb035206936421 +pandas==2.1.1 \ + --hash=sha256:02304e11582c5d090e5a52aec726f31fe3f42895d6bfc1f28738f9b64b6f0614 \ + --hash=sha256:0489b0e6aa3d907e909aef92975edae89b1ee1654db5eafb9be633b0124abe97 \ + --hash=sha256:05674536bd477af36aa2effd4ec8f71b92234ce0cc174de34fd21e2ee99adbc2 \ + --hash=sha256:25e8474a8eb258e391e30c288eecec565bfed3e026f312b0cbd709a63906b6f8 \ + --hash=sha256:29deb61de5a8a93bdd033df328441a79fcf8dd3c12d5ed0b41a395eef9cd76f0 \ + --hash=sha256:366da7b0e540d1b908886d4feb3d951f2f1e572e655c1160f5fde28ad4abb750 \ + --hash=sha256:3bcad1e6fb34b727b016775bea407311f7721db87e5b409e6542f4546a4951ea \ + --hash=sha256:4c3f32fd7c4dccd035f71734df39231ac1a6ff95e8bdab8d891167197b7018d2 \ + --hash=sha256:4cdb0fab0400c2cb46dafcf1a0fe084c8bb2480a1fa8d81e19d15e12e6d4ded2 \ + --hash=sha256:4f99bebf19b7e03cf80a4e770a3e65eee9dd4e2679039f542d7c1ace7b7b1daa \ + --hash=sha256:58d997dbee0d4b64f3cb881a24f918b5f25dd64ddf31f467bb9b67ae4c63a1e4 \ + --hash=sha256:75ce97667d06d69396d72be074f0556698c7f662029322027c226fd7a26965cb \ + --hash=sha256:84e7e910096416adec68075dc87b986ff202920fb8704e6d9c8c9897fe7332d6 \ + --hash=sha256:9e2959720b70e106bb1d8b6eadd8ecd7c8e99ccdbe03ee03260877184bb2877d \ + --hash=sha256:9e50e72b667415a816ac27dfcfe686dc5a0b02202e06196b943d54c4f9c7693e \ + --hash=sha256:a0dbfea0dd3901ad4ce2306575c54348d98499c95be01b8d885a2737fe4d7a98 \ + --hash=sha256:b407381258a667df49d58a1b637be33e514b07f9285feb27769cedb3ab3d0b3a \ + --hash=sha256:b8bd1685556f3374520466998929bade3076aeae77c3e67ada5ed2b90b4de7f0 \ + --hash=sha256:c1f84c144dee086fe4f04a472b5cd51e680f061adf75c1ae4fc3a9275560f8f4 \ + --hash=sha256:c747793c4e9dcece7bb20156179529898abf505fe32cb40c4052107a3c620b49 \ + --hash=sha256:cc1ab6a25da197f03ebe6d8fa17273126120874386b4ac11c1d687df288542dd \ + --hash=sha256:dc3657869c7902810f32bd072f0740487f9e030c1a3ab03e0af093db35a9d14e \ + --hash=sha256:f5ec7740f9ccb90aec64edd71434711f58ee0ea7f5ed4ac48be11cfa9abf7317 \ + --hash=sha256:fecb198dc389429be557cde50a2d46da8434a17fe37d7d41ff102e3987fd947b \ + --hash=sha256:ffa8f0966de2c22de408d0e322db2faed6f6e74265aa0856f3824813cf124363 # via # -r requirements/base.in # geopandas From de21b2cb15c6e1e5669b578b9a86887951a317f6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 26 Sep 2023 10:43:16 -0400 Subject: [PATCH 02/14] build(deps): bump zipp from 3.16.2 to 3.17.0 (#833) Bumps [zipp](https://github.com/jaraco/zipp) from 3.16.2 to 3.17.0. - [Release notes](https://github.com/jaraco/zipp/releases) - [Changelog](https://github.com/jaraco/zipp/blob/main/NEWS.rst) - [Commits](https://github.com/jaraco/zipp/compare/v3.16.2...v3.17.0) --- updated-dependencies: - dependency-name: zipp dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 735703ed8..cc21bf6d0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -815,7 +815,7 @@ xmltodict==0.13.0 \ --hash=sha256:341595a488e3e01a85a9d8911d8912fd922ede5fecc4dce437eb4b6c8d037e56 \ --hash=sha256:aa89e8fd76320154a40d19a0df04a4695fb9dc5ba977cbb68ab3e4eb225e7852 # via ddtrace -zipp==3.16.2 \ - --hash=sha256:679e51dd4403591b2d6838a48de3d283f3d188412a9782faadf845f298736ba0 \ - --hash=sha256:ebc15946aa78bd63458992fc81ec3b6f7b1e92d51c35e6de1c3804e73b799147 +zipp==3.17.0 \ + --hash=sha256:0e923e726174922dce09c53c59ad483ff7bbb8e572e00c7f7c46b88556409f31 \ + --hash=sha256:84e64a1c28cf7e91ed2078bb8cc8c259cb19b76942096c8d7b84947690cabaf0 # via importlib-metadata From 2b713abb5067fd4cbaa055d95f27c808fc8afd54 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 26 Sep 2023 10:43:53 -0400 Subject: [PATCH 03/14] build(deps-dev): bump types-pyyaml from 6.0.12.11 to 6.0.12.12 (#834) Bumps [types-pyyaml](https://github.com/python/typeshed) from 6.0.12.11 to 6.0.12.12. - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-pyyaml dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements-dev.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 658e16bde..722d4f84c 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -593,9 +593,9 @@ traitlets==5.9.0 \ # via # ipython # matplotlib-inline -types-pyyaml==6.0.12.11 \ - --hash=sha256:7d340b19ca28cddfdba438ee638cd4084bde213e501a3978738543e27094775b \ - --hash=sha256:a461508f3096d1d5810ec5ab95d7eeecb651f3a15b71959999988942063bf01d +types-pyyaml==6.0.12.12 \ + --hash=sha256:334373d392fde0fdf95af5c3f1661885fa10c52167b14593eb856289e1855062 \ + --hash=sha256:c05bc6c158facb0676674b7f11fe3960db4f389718e19e62bd2b84d6205cfd24 # via responses urllib3==1.26.16 \ --hash=sha256:8d36afa7616d8ab714608411b4a3b13e58f463aee519024578e062e141dce20f \ From 1516577c747a97be2b0e9309438a48d79d8d9cc3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 26 Sep 2023 10:44:10 -0400 Subject: [PATCH 04/14] build(deps-dev): bump moto from 4.2.3 to 4.2.4 (#835) Bumps [moto](https://github.com/getmoto/moto) from 4.2.3 to 4.2.4. - [Release notes](https://github.com/getmoto/moto/releases) - [Changelog](https://github.com/getmoto/moto/blob/master/CHANGELOG.md) - [Commits](https://github.com/getmoto/moto/compare/4.2.3...4.2.4) --- updated-dependencies: - dependency-name: moto dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements-dev.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 722d4f84c..3dd94dd74 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -421,9 +421,9 @@ mixer==7.2.2 \ --hash=sha256:8089b8e2d00288c77e622936198f5dd03c8ac1603a1530a4f870dc213363b2ae \ --hash=sha256:9b3f1a261b56d8f2394f39955f83adbc7ff3ab4bb1065ebfec19a10d3e8501e0 # via -r requirements/dev.in -moto==4.2.3 \ - --hash=sha256:2e934d834729b274382055e097b166127db829ab4fae00bb08c031c108391a2c \ - --hash=sha256:4caab0145d557d102fe79d0ce3b73d6bf1d916d29ad03c14da15f7da66429cdb +moto==4.2.4 \ + --hash=sha256:3516f55405015e4516c549d875c7a93e7daa1622d6342af335e63cf7bfe442fd \ + --hash=sha256:eea3c5b29987e8b12816b355dfdcca5d7a815a9d9f17208af31fa32acbe8b389 # via -r requirements/dev.in mypy-extensions==1.0.0 \ --hash=sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d \ From 4661059a1b83b76d7ef6e4b72f70d0764ac4e753 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 26 Sep 2023 10:44:17 -0400 Subject: [PATCH 05/14] build(deps-dev): bump traitlets from 5.9.0 to 5.10.0 (#837) Bumps [traitlets](https://github.com/ipython/traitlets) from 5.9.0 to 5.10.0. - [Release notes](https://github.com/ipython/traitlets/releases) - [Changelog](https://github.com/ipython/traitlets/blob/main/CHANGELOG.md) - [Commits](https://github.com/ipython/traitlets/compare/v5.9.0...v5.10.0) --- updated-dependencies: - dependency-name: traitlets dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements-dev.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 3dd94dd74..cb2a156c2 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -587,9 +587,9 @@ stack-data==0.6.2 \ --hash=sha256:32d2dd0376772d01b6cb9fc996f3c8b57a357089dec328ed4b6553d037eaf815 \ --hash=sha256:cbb2a53eb64e5785878201a97ed7c7b94883f48b87bfb0bbe8b623c74679e4a8 # via ipython -traitlets==5.9.0 \ - --hash=sha256:9e6ec080259b9a5940c797d58b613b5e31441c2257b87c2e795c5228ae80d2d8 \ - --hash=sha256:f6cde21a9c68cf756af02035f72d5a723bf607e862e7be33ece505abf4a3bad9 +traitlets==5.10.0 \ + --hash=sha256:417745a96681fbb358e723d5346a547521f36e9bd0d50ba7ab368fff5d67aa54 \ + --hash=sha256:f584ea209240466e66e91f3c81aa7d004ba4cf794990b0c775938a1544217cd1 # via # ipython # matplotlib-inline From 158765e2c542f542755efba8e1eb784d990c087f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 26 Sep 2023 11:31:17 -0400 Subject: [PATCH 06/14] build(deps): bump botocore from 1.31.52 to 1.31.53 (#830) Bumps [botocore](https://github.com/boto/botocore) from 1.31.52 to 1.31.53. - [Changelog](https://github.com/boto/botocore/blob/develop/CHANGELOG.rst) - [Commits](https://github.com/boto/botocore/compare/1.31.52...1.31.53) --- updated-dependencies: - dependency-name: botocore dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements-dev.txt | 6 +++--- requirements.txt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index cb2a156c2..43cd90c6e 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -44,9 +44,9 @@ boto3==1.28.52 \ --hash=sha256:1d36db102517d62c6968b3b0636303241f56859d12dd071def4882fc6e030b20 \ --hash=sha256:a34fc153cb2f6fb2f79a764286c967392e8aae9412381d943bddc576c4f7631a # via moto -botocore==1.31.52 \ - --hash=sha256:46b0a75a38521aa6a75fddccb1542e002930e609d4e13516f40fef170d32e515 \ - --hash=sha256:6d09881c5a8be34b497872ca3936f8757d886a6f42f2a8703411928189cfedc0 +botocore==1.31.53 \ + --hash=sha256:905580ea724d74f11652bab63fcec6bf0d32f1cf8b2963f7388efc0ea406b69b \ + --hash=sha256:aa647f94039d21de97c969df21ce8c5186b68234eb5c53148f0d8bbd708e375d # via # boto3 # moto diff --git a/requirements.txt b/requirements.txt index cc21bf6d0..0c3042e86 100644 --- a/requirements.txt +++ b/requirements.txt @@ -31,9 +31,9 @@ boto3==1.28.52 \ # via # -r requirements/base.in # django-ses -botocore==1.31.52 \ - --hash=sha256:46b0a75a38521aa6a75fddccb1542e002930e609d4e13516f40fef170d32e515 \ - --hash=sha256:6d09881c5a8be34b497872ca3936f8757d886a6f42f2a8703411928189cfedc0 +botocore==1.31.53 \ + --hash=sha256:905580ea724d74f11652bab63fcec6bf0d32f1cf8b2963f7388efc0ea406b69b \ + --hash=sha256:aa647f94039d21de97c969df21ce8c5186b68234eb5c53148f0d8bbd708e375d # via # boto3 # s3transfer From d54b3872ef2d5c9d4d7b06be2d782931664c0e37 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 26 Sep 2023 11:31:35 -0400 Subject: [PATCH 07/14] build(deps): bump pyproj from 3.6.0 to 3.6.1 (#828) Bumps [pyproj](https://github.com/pyproj4/pyproj) from 3.6.0 to 3.6.1. - [Release notes](https://github.com/pyproj4/pyproj/releases) - [Changelog](https://github.com/pyproj4/pyproj/blob/main/docs/history.rst) - [Commits](https://github.com/pyproj4/pyproj/compare/3.6.0...3.6.1) --- updated-dependencies: - dependency-name: pyproj dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 54 +++++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/requirements.txt b/requirements.txt index 0c3042e86..08582e497 100644 --- a/requirements.txt +++ b/requirements.txt @@ -591,32 +591,34 @@ pyjwt[crypto]==2.8.0 \ --hash=sha256:57e28d156e3d5c10088e0c68abb90bfac3df82b40a71bd0daa20c65ccd5c23de \ --hash=sha256:59127c392cc44c2da5bb3192169a91f429924e17aff6534d70fdc02ab3e04320 # via -r requirements/base.in -pyproj==3.6.0 \ - --hash=sha256:00fab048596c17572fa8980014ef117dbb2a445e6f7ba3b9ddfcc683efc598e7 \ - --hash=sha256:08dfc5c9533c78a97afae9d53b99b810a4a8f97c3be9eb2b8f323b726c736403 \ - --hash=sha256:1283d3c1960edbb74828f5f3405b27578a9a27f7766ab6a3956f4bd851f08239 \ - --hash=sha256:137a07404f937f264b11b7130cd4cfa00002dbe4333b222e8056db84849c2ea4 \ - --hash=sha256:18a8bdb87aeb41b60a2e91d32f623227de3569fb83b4c64b174c3a7c5b0ed3ae \ - --hash=sha256:23787460fab85ba2f857ee60ffb2e8e21fd9bd5db9833c51c1c05b2a6d9f0be5 \ - --hash=sha256:2799499a4045e4fb73e44c31bdacab0593a253a7a4b6baae6fdd27d604cf9bc2 \ - --hash=sha256:3a4d2d438b007cb1f8d5f6f308d53d7ff9a2508cff8f9da6e2a93b76ffd98aaf \ - --hash=sha256:4d8a9773503085eada59b6892c96ddf686ab8cf64cfdc18ad744d13ee76dfa6f \ - --hash=sha256:557e6592855111c84eda176ddf6b130f55d5e2b9cb1c017b8c91b69f37f474f5 \ - --hash=sha256:595376e4d3bb72b7dceeccbce0f4c43053d47561f17a1ad0224407e9980ee849 \ - --hash=sha256:78276c6b0c831255c97c56dff7313a3571f327a284d8ac63d6a56437a72ed0e0 \ - --hash=sha256:830e6de7cfe43853967afee5ef908dfd5aa72d1ec12af9b9e3fecc179886e346 \ - --hash=sha256:8fbac2eb9a0e425d7d6b7c6f4ebacd675cf3bdef0c59887057b8b4b0374e7c12 \ - --hash=sha256:95120d65cbc5983dfd877076f28dbc18b9b329cbee38ca6e217bb7a5a043c099 \ - --hash=sha256:9de1aab71234bfd3fd648a1152519b5ee152c43113d7d8ea52590a0140129501 \ - --hash=sha256:a5b111865b3f0f8b77b3983f2fbe4dd6248fc09d3730295949977c8dcd988062 \ - --hash=sha256:ba5e7c8ddd6ed5a3f9fcf95ea80ba44c931913723de2ece841c94bb38b200c4a \ - --hash=sha256:d7f6cd045df29aae960391dfe06a575c110af598f1dea5add8be6ca42332b0f5 \ - --hash=sha256:de6288b6ceabdeeac01abf627c74414822d322d8f55dc8efe4d29dedd27c5719 \ - --hash=sha256:dfe392dfc0eba2248dc08c976a72f52ff9da2bddfddfd9ff5dcf18e8e88200c7 \ - --hash=sha256:e342b3010b2b20134671564ff9a8c476e5e512bf589477480aded1a5813af7c8 \ - --hash=sha256:e427ccdbb1763872416549bdfa9fa1f5f169054653c4daf674e71480cc39cf11 \ - --hash=sha256:e600f6a2771d3b41aeb2cc1efd96771ae9a01451013da1dd48ff272e7c6e34ef \ - --hash=sha256:f04f6297c615c3b17f835df2556ac8fb9b4f51f281e960437eaf0cd80e7ae26a +pyproj==3.6.1 \ + --hash=sha256:18faa54a3ca475bfe6255156f2f2874e9a1c8917b0004eee9f664b86ccc513d3 \ + --hash=sha256:1e9fbaf920f0f9b4ee62aab832be3ae3968f33f24e2e3f7fbb8c6728ef1d9746 \ + --hash=sha256:2d6ff73cc6dbbce3766b6c0bce70ce070193105d8de17aa2470009463682a8eb \ + --hash=sha256:36b64c2cb6ea1cc091f329c5bd34f9c01bb5da8c8e4492c709bda6a09f96808f \ + --hash=sha256:38a3361941eb72b82bd9a18f60c78b0df8408416f9340521df442cebfc4306e2 \ + --hash=sha256:447db19c7efad70ff161e5e46a54ab9cc2399acebb656b6ccf63e4bc4a04b97a \ + --hash=sha256:44aa7c704c2b7d8fb3d483bbf75af6cb2350d30a63b144279a09b75fead501bf \ + --hash=sha256:4ba1f9b03d04d8cab24d6375609070580a26ce76eaed54631f03bab00a9c737b \ + --hash=sha256:4bc0472302919e59114aa140fd7213c2370d848a7249d09704f10f5b062031fe \ + --hash=sha256:50100b2726a3ca946906cbaa789dd0749f213abf0cbb877e6de72ca7aa50e1ae \ + --hash=sha256:5279586013b8d6582e22b6f9e30c49796966770389a9d5b85e25a4223286cd3f \ + --hash=sha256:6420ea8e7d2a88cb148b124429fba8cd2e0fae700a2d96eab7083c0928a85110 \ + --hash=sha256:65ad699e0c830e2b8565afe42bd58cc972b47d829b2e0e48ad9638386d994915 \ + --hash=sha256:6d227a865356f225591b6732430b1d1781e946893789a609bb34f59d09b8b0f8 \ + --hash=sha256:7a27151ddad8e1439ba70c9b4b2b617b290c39395fa9ddb7411ebb0eb86d6fb0 \ + --hash=sha256:80fafd1f3eb421694857f254a9bdbacd1eb22fc6c24ca74b136679f376f97d35 \ + --hash=sha256:83039e5ae04e5afc974f7d25ee0870a80a6bd6b7957c3aca5613ccbe0d3e72bf \ + --hash=sha256:8b8acc31fb8702c54625f4d5a2a6543557bec3c28a0ef638778b7ab1d1772132 \ + --hash=sha256:9274880263256f6292ff644ca92c46d96aa7e57a75c6df3f11d636ce845a1877 \ + --hash=sha256:ab7aa4d9ff3c3acf60d4b285ccec134167a948df02347585fdd934ebad8811b4 \ + --hash=sha256:c41e80ddee130450dcb8829af7118f1ab69eaf8169c4bf0ee8d52b72f098dc2f \ + --hash=sha256:db3aedd458e7f7f21d8176f0a1d924f1ae06d725228302b872885a1c34f3119e \ + --hash=sha256:e7e13c40183884ec7f94eb8e0f622f08f1d5716150b8d7a134de48c6110fee85 \ + --hash=sha256:ebfbdbd0936e178091309f6cd4fcb4decd9eab12aa513cdd9add89efa3ec2882 \ + --hash=sha256:fd43bd9a9b9239805f406fd82ba6b106bf4838d9ef37c167d3ed70383943ade1 \ + --hash=sha256:fd93c1a0c6c4aedc77c0fe275a9f2aba4d59b8acf88cebfc19fe3c430cfabf4f \ + --hash=sha256:fffb059ba3bced6f6725961ba758649261d85ed6ce670d3e3b0a26e81cf1aa8d # via # -r requirements/base.in # geopandas From 2f7e230faaa55f41fd270d86ab0dfac9162deb75 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 26 Sep 2023 11:31:58 -0400 Subject: [PATCH 08/14] build(deps): bump typing-extensions from 4.7.1 to 4.8.0 (#826) Bumps [typing-extensions](https://github.com/python/typing_extensions) from 4.7.1 to 4.8.0. - [Release notes](https://github.com/python/typing_extensions/releases) - [Changelog](https://github.com/python/typing_extensions/blob/main/CHANGELOG.md) - [Commits](https://github.com/python/typing_extensions/compare/4.7.1...4.8.0) --- updated-dependencies: - dependency-name: typing-extensions dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 08582e497..242f806a5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -720,9 +720,9 @@ text-unidecode==1.3 \ --hash=sha256:1311f10e8b895935241623731c2ba64f4c455287888b18189350b67134a822e8 \ --hash=sha256:bad6603bb14d279193107714b288be206cac565dfa49aa5b105294dd5c4aab93 # via graphene-django -typing-extensions==4.7.1 \ - --hash=sha256:440d5dd3af93b060174bf433bccd69b0babc3b15b1a8dca43789fd7f61514b36 \ - --hash=sha256:b75ddc264f0ba5615db7ba217daeb99701ad295353c45f9e95963337ceeeffb2 +typing-extensions==4.8.0 \ + --hash=sha256:8f92fc8806f9a6b641eaa5318da32b44d401efaac0f6678c9bc448ba3605faa0 \ + --hash=sha256:df8e4339e9cb77357558cbdbceca33c303714cf861d1eef15e1070055ae8b7ef # via # ddtrace # dj-database-url From e5fc63022b8e546ba96534feb1212d484cb06bce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 26 Sep 2023 11:33:29 -0400 Subject: [PATCH 09/14] build(deps): bump numpy from 1.25.2 to 1.26.0 (#831) Bumps [numpy](https://github.com/numpy/numpy) from 1.25.2 to 1.26.0. - [Release notes](https://github.com/numpy/numpy/releases) - [Changelog](https://github.com/numpy/numpy/blob/main/doc/RELEASE_WALKTHROUGH.rst) - [Commits](https://github.com/numpy/numpy/compare/v1.25.2...v1.26.0) --- updated-dependencies: - dependency-name: numpy dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 59 +++++++++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 26 deletions(-) diff --git a/requirements.txt b/requirements.txt index 242f806a5..675c3a365 100644 --- a/requirements.txt +++ b/requirements.txt @@ -471,32 +471,39 @@ jmespath==1.0.1 \ jwcrypto==1.5.0 \ --hash=sha256:2c1dc51cf8e38ddf324795dfe9426dee9dd46caf47f535ccbc18781fba810b8d # via django-oauth-toolkit -numpy==1.25.2 \ - --hash=sha256:0d60fbae8e0019865fc4784745814cff1c421df5afee233db6d88ab4f14655a2 \ - --hash=sha256:1a1329e26f46230bf77b02cc19e900db9b52f398d6722ca853349a782d4cff55 \ - --hash=sha256:1b9735c27cea5d995496f46a8b1cd7b408b3f34b6d50459d9ac8fe3a20cc17bf \ - --hash=sha256:2792d23d62ec51e50ce4d4b7d73de8f67a2fd3ea710dcbc8563a51a03fb07b01 \ - --hash=sha256:3e0746410e73384e70d286f93abf2520035250aad8c5714240b0492a7302fdca \ - --hash=sha256:4c3abc71e8b6edba80a01a52e66d83c5d14433cbcd26a40c329ec7ed09f37901 \ - --hash=sha256:5883c06bb92f2e6c8181df7b39971a5fb436288db58b5a1c3967702d4278691d \ - --hash=sha256:5c97325a0ba6f9d041feb9390924614b60b99209a71a69c876f71052521d42a4 \ - --hash=sha256:60e7f0f7f6d0eee8364b9a6304c2845b9c491ac706048c7e8cf47b83123b8dbf \ - --hash=sha256:76b4115d42a7dfc5d485d358728cdd8719be33cc5ec6ec08632a5d6fca2ed380 \ - --hash=sha256:7dc869c0c75988e1c693d0e2d5b26034644399dd929bc049db55395b1379e044 \ - --hash=sha256:834b386f2b8210dca38c71a6e0f4fd6922f7d3fcff935dbe3a570945acb1b545 \ - --hash=sha256:8b77775f4b7df768967a7c8b3567e309f617dd5e99aeb886fa14dc1a0791141f \ - --hash=sha256:90319e4f002795ccfc9050110bbbaa16c944b1c37c0baeea43c5fb881693ae1f \ - --hash=sha256:b79e513d7aac42ae918db3ad1341a015488530d0bb2a6abcbdd10a3a829ccfd3 \ - --hash=sha256:bb33d5a1cf360304754913a350edda36d5b8c5331a8237268c48f91253c3a364 \ - --hash=sha256:bec1e7213c7cb00d67093247f8c4db156fd03075f49876957dca4711306d39c9 \ - --hash=sha256:c5462d19336db4560041517dbb7759c21d181a67cb01b36ca109b2ae37d32418 \ - --hash=sha256:c5652ea24d33585ea39eb6a6a15dac87a1206a692719ff45d53c5282e66d4a8f \ - --hash=sha256:d7806500e4f5bdd04095e849265e55de20d8cc4b661b038957354327f6d9b295 \ - --hash=sha256:db3ccc4e37a6873045580d413fe79b68e47a681af8db2e046f1dacfa11f86eb3 \ - --hash=sha256:dfe4a913e29b418d096e696ddd422d8a5d13ffba4ea91f9f60440a3b759b0187 \ - --hash=sha256:eb942bfb6f84df5ce05dbf4b46673ffed0d3da59f13635ea9b926af3deb76926 \ - --hash=sha256:f08f2e037bba04e707eebf4bc934f1972a315c883a9e0ebfa8a7756eabf9e357 \ - --hash=sha256:fd608e19c8d7c55021dffd43bfe5492fab8cc105cc8986f813f8c3c048b38760 +numpy==1.26.0 \ + --hash=sha256:020cdbee66ed46b671429c7265cf00d8ac91c046901c55684954c3958525dab2 \ + --hash=sha256:0621f7daf973d34d18b4e4bafb210bbaf1ef5e0100b5fa750bd9cde84c7ac292 \ + --hash=sha256:0792824ce2f7ea0c82ed2e4fecc29bb86bee0567a080dacaf2e0a01fe7654369 \ + --hash=sha256:09aaee96c2cbdea95de76ecb8a586cb687d281c881f5f17bfc0fb7f5890f6b91 \ + --hash=sha256:166b36197e9debc4e384e9c652ba60c0bacc216d0fc89e78f973a9760b503388 \ + --hash=sha256:186ba67fad3c60dbe8a3abff3b67a91351100f2661c8e2a80364ae6279720299 \ + --hash=sha256:306545e234503a24fe9ae95ebf84d25cba1fdc27db971aa2d9f1ab6bba19a9dd \ + --hash=sha256:436c8e9a4bdeeee84e3e59614d38c3dbd3235838a877af8c211cfcac8a80b8d3 \ + --hash=sha256:4a873a8180479bc829313e8d9798d5234dfacfc2e8a7ac188418189bb8eafbd2 \ + --hash=sha256:4acc65dd65da28060e206c8f27a573455ed724e6179941edb19f97e58161bb69 \ + --hash=sha256:51be5f8c349fdd1a5568e72713a21f518e7d6707bcf8503b528b88d33b57dc68 \ + --hash=sha256:546b7dd7e22f3c6861463bebb000646fa730e55df5ee4a0224408b5694cc6148 \ + --hash=sha256:5671338034b820c8d58c81ad1dafc0ed5a00771a82fccc71d6438df00302094b \ + --hash=sha256:637c58b468a69869258b8ae26f4a4c6ff8abffd4a8334c830ffb63e0feefe99a \ + --hash=sha256:767254ad364991ccfc4d81b8152912e53e103ec192d1bb4ea6b1f5a7117040be \ + --hash=sha256:7d484292eaeb3e84a51432a94f53578689ffdea3f90e10c8b203a99be5af57d8 \ + --hash=sha256:7f6bad22a791226d0a5c7c27a80a20e11cfe09ad5ef9084d4d3fc4a299cca505 \ + --hash=sha256:86f737708b366c36b76e953c46ba5827d8c27b7a8c9d0f471810728e5a2fe57c \ + --hash=sha256:8c6adc33561bd1d46f81131d5352348350fc23df4d742bb246cdfca606ea1208 \ + --hash=sha256:914b28d3215e0c721dc75db3ad6d62f51f630cb0c277e6b3bcb39519bed10bd8 \ + --hash=sha256:b44e6a09afc12952a7d2a58ca0a2429ee0d49a4f89d83a0a11052da696440e49 \ + --hash=sha256:bb0d9a1aaf5f1cb7967320e80690a1d7ff69f1d47ebc5a9bea013e3a21faec95 \ + --hash=sha256:c0b45c8b65b79337dee5134d038346d30e109e9e2e9d43464a2970e5c0e93229 \ + --hash=sha256:c2e698cb0c6dda9372ea98a0344245ee65bdc1c9dd939cceed6bb91256837896 \ + --hash=sha256:c78a22e95182fb2e7874712433eaa610478a3caf86f28c621708d35fa4fd6e7f \ + --hash=sha256:e062aa24638bb5018b7841977c360d2f5917268d125c833a686b7cbabbec496c \ + --hash=sha256:e5e18e5b14a7560d8acf1c596688f4dfd19b4f2945b245a71e5af4ddb7422feb \ + --hash=sha256:eae430ecf5794cb7ae7fa3808740b015aa80747e5266153128ef055975a72b99 \ + --hash=sha256:ee84ca3c58fe48b8ddafdeb1db87388dce2c3c3f701bf447b05e4cfcc3679112 \ + --hash=sha256:f042f66d0b4ae6d48e70e28d487376204d3cbf43b84c03bac57e28dac6151581 \ + --hash=sha256:f8db2f125746e44dce707dd44d4f4efeea8d7e2b43aace3f8d1f235cfa2733dd \ + --hash=sha256:f93fc78fe8bf15afe2b8d6b6499f1c73953169fad1e9a8dd086cdff3190e7fdf # via # pandas # shapely From bd5c753bd29a4a1ebdbf637049a8520a5bfc533f Mon Sep 17 00:00:00 2001 From: Jose Buitron Date: Tue, 26 Sep 2023 10:52:56 -0500 Subject: [PATCH 10/14] fix: Renamed ecosystems types --- .../0045_taxonomyterms_ecosystems_renamed.py | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 terraso_backend/apps/core/migrations/0045_taxonomyterms_ecosystems_renamed.py diff --git a/terraso_backend/apps/core/migrations/0045_taxonomyterms_ecosystems_renamed.py b/terraso_backend/apps/core/migrations/0045_taxonomyterms_ecosystems_renamed.py new file mode 100644 index 000000000..1ada0a473 --- /dev/null +++ b/terraso_backend/apps/core/migrations/0045_taxonomyterms_ecosystems_renamed.py @@ -0,0 +1,45 @@ +# Copyright © 2023 Technology Matters +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published +# by the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see https://www.gnu.org/licenses/. + +from django.db import migrations, models + +import apps.core.models.commons + +TERMS = { + "ecosystem-type": [ + ("Deserts", "Desert", "Desierto"), + ("Savannas", "Savannah", "Sabana"), + ("Shrublands", "Shrubland", "Matorrales"), + ], +} + + +class Migration(migrations.Migration): + dependencies = [ + ("core", "0044_notifications"), + ] + + operations = [ + migrations.RunSQL( + sql=[ + ( + "UPDATE core_taxonomyterm SET value_es = %s, value_en= %s WHERE value_original = %s AND type= %s", + [value_es, value_en, current_value, type], + ) + ], + ) + for type, values in TERMS.items() + for (current_value, value_en, value_es) in values + ] From 1bde2544854d42fd65f90c480af0110112f62965 Mon Sep 17 00:00:00 2001 From: Jose Buitron Date: Tue, 26 Sep 2023 10:55:31 -0500 Subject: [PATCH 11/14] fix: Changed language codes to use 3 characters --- terraso_backend/tests/core/test_landscapes_views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/terraso_backend/tests/core/test_landscapes_views.py b/terraso_backend/tests/core/test_landscapes_views.py index a372c4df7..84a88b61a 100644 --- a/terraso_backend/tests/core/test_landscapes_views.py +++ b/terraso_backend/tests/core/test_landscapes_views.py @@ -136,8 +136,8 @@ def test_get_landscape_json_view_terms(client, landscape): "type": "ecosystem-type", "value": { "original": "Test Term", - "en": "Test Term en", - "es": "Test Term es", + "eng": "Test Term en", + "spa": "Test Term es", }, } ] From 3a6053e360429c48daf2d8bae6f2ee3585c8c5c1 Mon Sep 17 00:00:00 2001 From: Jose Buitron Date: Tue, 26 Sep 2023 12:27:13 -0500 Subject: [PATCH 12/14] fix: Changed language codes to use 3 characters --- terraso_backend/apps/core/landscapes_views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/terraso_backend/apps/core/landscapes_views.py b/terraso_backend/apps/core/landscapes_views.py index f7f231179..c34fa240d 100644 --- a/terraso_backend/apps/core/landscapes_views.py +++ b/terraso_backend/apps/core/landscapes_views.py @@ -64,8 +64,8 @@ def to_json(self, landscape): "type": term.type, "value": { "original": term.value_original, - "en": term.value_en, - "es": term.value_es, + "eng": term.value_en, + "spa": term.value_es, }, } for term in terms From 3f37069dc42ceb336b0d878fe2b98392b06ed60f Mon Sep 17 00:00:00 2001 From: Jose Buitron Date: Tue, 26 Sep 2023 12:28:04 -0500 Subject: [PATCH 13/14] fix: Changed taxonomy terms constant values to avoid changing case for different use cases --- terraso_backend/apps/core/models/taxonomy_terms.py | 12 ++++++------ terraso_backend/tests/core/test_landscapes_views.py | 2 +- .../graphql/mutations/test_landscape_mutations.py | 4 ++-- terraso_backend/tests/graphql/test_taxonomy_terms.py | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/terraso_backend/apps/core/models/taxonomy_terms.py b/terraso_backend/apps/core/models/taxonomy_terms.py index 4d805e97d..b6b0836c1 100644 --- a/terraso_backend/apps/core/models/taxonomy_terms.py +++ b/terraso_backend/apps/core/models/taxonomy_terms.py @@ -21,12 +21,12 @@ class TaxonomyTerm(SlugModel): - TYPE_ECOSYSTEM_TYPE = "ecosystem-type" - TYPE_LANGUAGE = "language" - TYPE_LIVELIHOOD = "livelihood" - TYPE_COMMODITY = "commodity" - TYPE_ORGANIZATION = "organization" - TYPE_AGRICULTURAL_PRODUCTION_METHOD = "agricultural-production-method" + TYPE_ECOSYSTEM_TYPE = "ECOSYSTEM_TYPE" + TYPE_LANGUAGE = "LANGUAGE" + TYPE_LIVELIHOOD = "LIVELIHOOD" + TYPE_COMMODITY = "COMMODITY" + TYPE_ORGANIZATION = "ORGANIZATION" + TYPE_AGRICULTURAL_PRODUCTION_METHOD = "AGRICULTURAL_PRODUCTION_METHOD" TYPES = ( (TYPE_ECOSYSTEM_TYPE, _("Ecosystem Type")), diff --git a/terraso_backend/tests/core/test_landscapes_views.py b/terraso_backend/tests/core/test_landscapes_views.py index 84a88b61a..cf7a5764a 100644 --- a/terraso_backend/tests/core/test_landscapes_views.py +++ b/terraso_backend/tests/core/test_landscapes_views.py @@ -133,7 +133,7 @@ def test_get_landscape_json_view_terms(client, landscape): assert json_response["taxonomyTerms"] == [ { - "type": "ecosystem-type", + "type": "ECOSYSTEM_TYPE", "value": { "original": "Test Term", "eng": "Test Term en", diff --git a/terraso_backend/tests/graphql/mutations/test_landscape_mutations.py b/terraso_backend/tests/graphql/mutations/test_landscape_mutations.py index 17302bf09..c1ceac62b 100644 --- a/terraso_backend/tests/graphql/mutations/test_landscape_mutations.py +++ b/terraso_backend/tests/graphql/mutations/test_landscape_mutations.py @@ -229,13 +229,13 @@ def test_landscapes_update_taxonomy_terms(client_query, managed_landscapes): { "language": [ { - "type": "language", + "type": "LANGUAGE", "valueOriginal": "an", "valueEn": "Aragonese", "valueEs": "Aragonés", }, { - "type": "language", + "type": "LANGUAGE", "valueOriginal": "eo", "valueEn": "Esperanto", "valueEs": "Esperanto", diff --git a/terraso_backend/tests/graphql/test_taxonomy_terms.py b/terraso_backend/tests/graphql/test_taxonomy_terms.py index 250586616..41aee7851 100644 --- a/terraso_backend/tests/graphql/test_taxonomy_terms.py +++ b/terraso_backend/tests/graphql/test_taxonomy_terms.py @@ -49,6 +49,6 @@ def test_landscape_get_one_by_type(client_query, taxonomy_terms): """ response = client_query(query) result = response.json()["data"]["taxonomyTerms"]["edges"] - language_terms = [term for term in taxonomy_terms if term.type == "language"] + language_terms = [term for term in taxonomy_terms if term.type == "LANGUAGE"] assert len(result) == len(language_terms) From ee432e0e66429b4ae6e471c5b83f6cbc1b1b108e Mon Sep 17 00:00:00 2001 From: Jose Buitron Date: Tue, 26 Sep 2023 12:28:18 -0500 Subject: [PATCH 14/14] fix: Renamed ecosystems types --- .../0045_taxonomyterms_ecosystems_renamed.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/terraso_backend/apps/core/migrations/0045_taxonomyterms_ecosystems_renamed.py b/terraso_backend/apps/core/migrations/0045_taxonomyterms_ecosystems_renamed.py index 1ada0a473..01ea50f76 100644 --- a/terraso_backend/apps/core/migrations/0045_taxonomyterms_ecosystems_renamed.py +++ b/terraso_backend/apps/core/migrations/0045_taxonomyterms_ecosystems_renamed.py @@ -18,7 +18,7 @@ import apps.core.models.commons TERMS = { - "ecosystem-type": [ + "ECOSYSTEM_TYPE": [ ("Deserts", "Desert", "Desierto"), ("Savannas", "Savannah", "Sabana"), ("Shrublands", "Shrubland", "Matorrales"), @@ -35,8 +35,17 @@ class Migration(migrations.Migration): migrations.RunSQL( sql=[ ( - "UPDATE core_taxonomyterm SET value_es = %s, value_en= %s WHERE value_original = %s AND type= %s", - [value_es, value_en, current_value, type], + """ + UPDATE core_taxonomyterm + SET + value_es = %s, + value_original = %s, + value_en = %s + WHERE + value_original = %s AND + type = %s + """, + [value_es, value_en, value_en, current_value, type], ) ], )