diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 087388ff..bc707054 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,18 +50,11 @@ jobs: pytest -v tests --tb=short - name: Test worldengine command - if: runner.os != 'Windows' working-directory: worldengine run: | worldengine --help worldengine world -s 42 -n test_world -x 512 -y 512 - - name: Test worldengine command (Windows - no world generation) - if: runner.os == 'Windows' - working-directory: worldengine - run: | - worldengine --help - lint: name: Lint and Type Check runs-on: ubuntu-latest diff --git a/pyproject.toml b/pyproject.toml index 44b1b3d5..6a403810 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,7 +29,7 @@ classifiers = [ "Topic :: Scientific/Engineering", ] dependencies = [ - "PyPlatec==1.4.2", + "PyPlatec==1.4.3", "pypng>=0.20220715.0", "numpy>=1.24.0", "noise==1.2.2", diff --git a/setup.py b/setup.py index 28a148b9..201d351c 100644 --- a/setup.py +++ b/setup.py @@ -32,7 +32,7 @@ "entry_points": { "console_scripts": ["worldengine=worldengine.cli.main:main"], }, - "install_requires": ["PyPlatec==1.4.2", "pypng>=0.20220715.0", "numpy>=1.24.0", "noise==1.2.2", "protobuf>=4.21.0"], + "install_requires": ["PyPlatec==1.4.3", "pypng>=0.20220715.0", "numpy>=1.24.0", "noise==1.2.2", "protobuf>=4.21.0"], "python_requires": ">=3.9", "classifiers": [ "Development Status :: 4 - Beta", diff --git a/tox.ini b/tox.ini index f8eb2d49..ce6956a6 100644 --- a/tox.ini +++ b/tox.ini @@ -11,7 +11,7 @@ uv_seed = true deps = Cython>=3.0.0 numpy>=1.24.0 - PyPlatec==1.4.2 + PyPlatec==1.4.3 protobuf>=4.21.0 pypng>=0.20220715.0 noise==1.2.2 diff --git a/uv.lock b/uv.lock index 152163a1..36e04427 100644 --- a/uv.lock +++ b/uv.lock @@ -1185,28 +1185,28 @@ wheels = [ [[package]] name = "pyplatec" -version = "1.4.2" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/af/67/2a527aca4ca0a2047749239aa2fe0999e68b7b9a0d8cc41319e399cf5939/pyplatec-1.4.2.tar.gz", hash = "sha256:b34347a811961f568aaf9ceee4a05a072f7ecbc8a3eb34f811ee7abe97864b56", size = 54359, upload-time = "2025-11-17T20:03:03.044Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/21/5c/e02ae7cd05dca4da6028f9a99904f4e2ec95b7b0158b70af439e6b6aba1d/pyplatec-1.4.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:35d62e8f59bb5571cde3eb92c43378bb8a99919e13030aac44d819c27fb5f315", size = 130248, upload-time = "2025-11-17T20:02:27.554Z" }, - { url = "https://files.pythonhosted.org/packages/ab/6b/41b5277eda5eb73fd7b615ddd179d1f41637c960e7efe4d1896ab890aaf7/pyplatec-1.4.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d5e5646dfdf229b7d169878fcc5155fd45a2edc8ed3d4a0232ec02d6b67c6438", size = 651959, upload-time = "2025-11-17T20:02:31.005Z" }, - { url = "https://files.pythonhosted.org/packages/a3/fb/bf1cf8970b62fc15496deb4675f95a825f53c4cc3a6b3306a1f207ef3bb4/pyplatec-1.4.2-cp310-cp310-win_amd64.whl", hash = "sha256:f4d4ef4d73092195a09a85e6d54a9ae92b1e7ced7b145fc511fdda019627f244", size = 52437, upload-time = "2025-11-17T20:02:34.848Z" }, - { url = "https://files.pythonhosted.org/packages/ef/e0/660e159418bba8b3503d84a1c83ed1d1bd8af58e95c41dba05194491dc77/pyplatec-1.4.2-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:7a11cb80d8ec5046172c2a1d48104e229b74a7509674a52f260299df58ad5a0e", size = 130272, upload-time = "2025-11-17T20:02:35.953Z" }, - { url = "https://files.pythonhosted.org/packages/73/53/89bcc953abf3733745d0608ead9c84090c605d7e3f6b121c0c18f65b6ef6/pyplatec-1.4.2-cp311-cp311-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:388017ebdbed6225e86680e2dc06b273a568aeb639f7f6e3176ff164271ad682", size = 620355, upload-time = "2025-11-17T20:02:37.88Z" }, - { url = "https://files.pythonhosted.org/packages/44/59/f129d23cd8d655cef6cfdffd743bee86e695c54dbbba98c74ac65b214167/pyplatec-1.4.2-cp311-cp311-win_amd64.whl", hash = "sha256:3f59d05c604f365a0e2869fbf8b23eb20f64b8280805370a12e5c54f4c590451", size = 52432, upload-time = "2025-11-17T20:02:38.89Z" }, - { url = "https://files.pythonhosted.org/packages/8a/71/ae8d5b56791fcbe1d34a43a55a9dcbbd932a06947ac58951aba649641402/pyplatec-1.4.2-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:136f630841a07c34b4f782b8d941428c6f741fc9026e0b199a0b3299f89ac88a", size = 130352, upload-time = "2025-11-17T20:02:40.383Z" }, - { url = "https://files.pythonhosted.org/packages/cc/9b/d0a82fd3b08d7f62d94c881a2fb96c6f46b336812aabb54f0ad677047da6/pyplatec-1.4.2-cp312-cp312-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1d2b5dd4316f12e9a1c5ec4eccb4e833ba745c302e503b79868ae31135c11cf4", size = 620537, upload-time = "2025-11-17T20:02:42.811Z" }, - { url = "https://files.pythonhosted.org/packages/d0/e0/2a962f5bd1fed41f9fb794820f19929fe6f62f611c8ca2e45365b77f68dd/pyplatec-1.4.2-cp312-cp312-win_amd64.whl", hash = "sha256:2169026e209c9c5b9a8ed20dbef87d7b66a5913e2dc9210b73b14ee45562f8e5", size = 52475, upload-time = "2025-11-17T20:02:44.144Z" }, - { url = "https://files.pythonhosted.org/packages/c4/86/f291e38405b66295183f87ce4a0b21ee740130f6dc9948ca417177de275b/pyplatec-1.4.2-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:d432b3c1759b22c6481d48b28f9fef7026dea431e4a4481fbacca752c86dc00f", size = 130362, upload-time = "2025-11-17T20:02:47.519Z" }, - { url = "https://files.pythonhosted.org/packages/30/bb/61076667bd5cf64919d22c7ecb9e37bf0fb7074455a2ee3a37248fa8eb4f/pyplatec-1.4.2-cp313-cp313-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e8c808d4d7082ab569b57bd4f70440067c9b90208f641bed6c02bf50f86851e8", size = 620463, upload-time = "2025-11-17T20:02:49.497Z" }, - { url = "https://files.pythonhosted.org/packages/23/38/ce0e36bcdc93ece0ca5c2f625c0c0369b8e0e06fad43f3229729483d10a4/pyplatec-1.4.2-cp313-cp313-win_amd64.whl", hash = "sha256:b62f7abc794c0432ca2c4d2c8f2bf6f91a6cb96a254e617e17e020d6170e42a5", size = 52471, upload-time = "2025-11-17T20:02:51.923Z" }, - { url = "https://files.pythonhosted.org/packages/fd/bd/21e34279e7efec458e4f6937efc139ea2ef089fb7a277990f3aafae169d6/pyplatec-1.4.2-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:6492a235a4946d7bd220b6a45583a647e5d38438a0e7e23286222be9d10ca328", size = 130435, upload-time = "2025-11-17T20:02:53.38Z" }, - { url = "https://files.pythonhosted.org/packages/c1/8c/44fd62d2a588e22fcb74116bfb5e59ae8bfbc673448a33bb324262c75bae/pyplatec-1.4.2-cp314-cp314-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:7f6cfc2f48edf2592b8f9b40c9281c7f9f6d169912ebe14faccd7b6151edcddf", size = 620494, upload-time = "2025-11-17T20:02:55.819Z" }, - { url = "https://files.pythonhosted.org/packages/91/7f/b12cbc139dc50f48f94b3ffca2393689ce9d67964ab98b9a74db29f976b2/pyplatec-1.4.2-cp314-cp314-win_amd64.whl", hash = "sha256:c510a7227c71664baa20fcc69b95aafa248e1d841c30c794e321dde740e747c5", size = 53777, upload-time = "2025-11-17T20:02:56.902Z" }, - { url = "https://files.pythonhosted.org/packages/38/fa/42b3f3ff14a0cb1af2df92a273d77e3a698b5be0b67825f43690535c45f1/pyplatec-1.4.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:e895ff8f27f26c62bfb06fbdda8235c11e32833da411600c2ebfddbcb736d9fa", size = 130248, upload-time = "2025-11-17T20:02:58.228Z" }, - { url = "https://files.pythonhosted.org/packages/09/fc/c099e1b78d9ab2ae6c14b1a85c759560bfe84f7b940afb0af694aa1030eb/pyplatec-1.4.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9623a16b6b6d4e81593c5e5860a70bb049b3395b21a42bf79fdf137a6eff9676", size = 651791, upload-time = "2025-11-17T20:02:59.77Z" }, - { url = "https://files.pythonhosted.org/packages/7b/5c/37c39ea0e24df70b5a3441659f3e485a338690f60310c0f06d1ae1e1098c/pyplatec-1.4.2-cp39-cp39-win_amd64.whl", hash = "sha256:81cd4f92264a25cb09bc4bb3ea491ad48972d1b0330e5a44fcd11279645df7a7", size = 52428, upload-time = "2025-11-17T20:03:00.912Z" }, +version = "1.4.3" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/80/ed/d868d0868cafa0d0f116f63862f6b9bf15ec044d144831014442994a95f1/pyplatec-1.4.3.tar.gz", hash = "sha256:3d742526d0b867489fa61a937a53ae0504b9c2e6f1087fdfd0f4969c4ece78d8", size = 55046, upload-time = "2025-11-18T14:13:12.49Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/c5/d4/bba514907374992eab1cd08760e45f5d62c77ef18ae7fd32769fdf7ee765/pyplatec-1.4.3-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:3f48329bb088d5be31be84246e7e8fbd40a61b694df1c38da57acba8daaff34a", size = 131105, upload-time = "2025-11-18T14:12:51.854Z" }, + { url = "https://files.pythonhosted.org/packages/dc/2d/045b3acb71b35acf8400ab9c409ed1d6cdae470b43278fb75b467b362189/pyplatec-1.4.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d3e1f13d0481811232638a4db28f15c8d9d7aa89a57ec6fd76669b0001c2221d", size = 653026, upload-time = "2025-11-18T14:12:53.459Z" }, + { url = "https://files.pythonhosted.org/packages/78/69/1092a9bcc8abfbdd9f17822e3a38308df206d89ffe9d3df117cfa67c45dc/pyplatec-1.4.3-cp310-cp310-win_amd64.whl", hash = "sha256:244e84670e1d38e8a8eea93db1389ff516a85328314de5614b4c5244ae13f2b5", size = 52696, upload-time = "2025-11-18T14:12:54.63Z" }, + { url = "https://files.pythonhosted.org/packages/3a/7d/d1152943ae7d5963d6c299c19485fe4c29882dce8c8b3de7eea6c1e507e1/pyplatec-1.4.3-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:633a56815c329063ad178cb13988ffcd2433291daf7a273c358e1e5c7721133b", size = 131086, upload-time = "2025-11-18T14:12:55.6Z" }, + { url = "https://files.pythonhosted.org/packages/4d/99/2b3bc9eafcfd4059afdb5759b289d03ac61e0f7b928936de7cdf7dcb9b30/pyplatec-1.4.3-cp311-cp311-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:34f502727201dc0279337a29d51c463a4ae8e2559bc666179dae0b8eb05b1a12", size = 621292, upload-time = "2025-11-18T14:12:56.69Z" }, + { url = "https://files.pythonhosted.org/packages/d3/91/b6791fcff86caccf1bb892ddfcbe310dff0f29b7e386e62c365fb02bc269/pyplatec-1.4.3-cp311-cp311-win_amd64.whl", hash = "sha256:ab49f49edff5da1b3a1ee96affcb89c777735d35cfd873cf453874f9bf32bc32", size = 52695, upload-time = "2025-11-18T14:12:57.706Z" }, + { url = "https://files.pythonhosted.org/packages/2e/b5/6c1a38f79c5a4a8687cef10cb5039bef8562d7d2963043f57d7ac02f6f63/pyplatec-1.4.3-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:1c369ff03b9b1123626c9ee66c607a673cbfe90cd54b7de8c3e07270109a782c", size = 131187, upload-time = "2025-11-18T14:12:58.55Z" }, + { url = "https://files.pythonhosted.org/packages/2f/6c/7442712d5328c9031d1f6fe56f331e4c67bc344e7bc27aeb22387f35982d/pyplatec-1.4.3-cp312-cp312-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9b08bcbd6dffbfc8322b58aab5aeb4623fb4f5a0d511749bcc547d7037e76726", size = 621368, upload-time = "2025-11-18T14:12:59.77Z" }, + { url = "https://files.pythonhosted.org/packages/4c/ba/3cdcd67020e4e8da2c8ab796370856abc0976c0c4613d984c649fda3fa2f/pyplatec-1.4.3-cp312-cp312-win_amd64.whl", hash = "sha256:4841063d61e2786c274690d427f0712b4a10c3a6a894a6a13734d5312acfcd5a", size = 52760, upload-time = "2025-11-18T14:13:00.811Z" }, + { url = "https://files.pythonhosted.org/packages/93/08/d1b060430c3128245cf1e55278eb13e97512bda65affd3193e0c0940b9f0/pyplatec-1.4.3-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:b441010f501179feadbc9bb376fa45e4fcde66d18dc6abfd65ddaa6c525713e4", size = 131175, upload-time = "2025-11-18T14:13:02.055Z" }, + { url = "https://files.pythonhosted.org/packages/37/f5/363b9233c1373b4cfdbfbb5047881ecaf4cd8d9ac269db0ad277d1219284/pyplatec-1.4.3-cp313-cp313-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:df3b50c19eff9d8d323f3d2d5ce11de22f4af98db5c96abbe60c48b57f3a3058", size = 621329, upload-time = "2025-11-18T14:13:03.003Z" }, + { url = "https://files.pythonhosted.org/packages/8e/6d/d2b4ac21256023e0cf79782eb0ea1c76ab387534de1b35a9dc1c0b227969/pyplatec-1.4.3-cp313-cp313-win_amd64.whl", hash = "sha256:a4ad2b38912b3a004c9d8436d88b514b0086e2684cac3aa6f0f7e0660de24d52", size = 52760, upload-time = "2025-11-18T14:13:04.083Z" }, + { url = "https://files.pythonhosted.org/packages/70/66/60467ee3865125510ea5bf76cd134d3fa51652bdd69293a6eb038aea8028/pyplatec-1.4.3-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:6bb0ce2782aae72f6f1972e5684c946c62dbd0ddc6190cebfa7ccd0bab9f2b55", size = 131231, upload-time = "2025-11-18T14:13:05.025Z" }, + { url = "https://files.pythonhosted.org/packages/51/7e/1358775092052ec58ed36f4ec7aca02d78b38eea2a5515f469bab5339acf/pyplatec-1.4.3-cp314-cp314-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c8ee9804f10c96124a55001657dbf92439dbf0620954a69c89f9e6529be09c62", size = 621346, upload-time = "2025-11-18T14:13:06.276Z" }, + { url = "https://files.pythonhosted.org/packages/07/80/7bbcd9150f05e87519923e024082cb3f189edf78bff33bfa5e49f3d3133c/pyplatec-1.4.3-cp314-cp314-win_amd64.whl", hash = "sha256:2e9ce80ee54edb96468e6b1ba7b92983ff28fd9ed51a711bee472e10e39832bc", size = 54129, upload-time = "2025-11-18T14:13:07.773Z" }, + { url = "https://files.pythonhosted.org/packages/01/3e/d0771fb22eb58fca64f33980945857cb6d633dddc309fcb599683337ff07/pyplatec-1.4.3-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:aa2a65acb46efe4cc1b58e7de8afe7efc700ad1bb0d6687eea8ca1049165fb2e", size = 131073, upload-time = "2025-11-18T14:13:08.923Z" }, + { url = "https://files.pythonhosted.org/packages/de/9e/020b0bd04eb2c89a88363488a36796af8a64e12bb84feb51906a89ab219b/pyplatec-1.4.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cafa31380185514be2429cf2956a74d77a65d01f3169a30f4141d70299d17d40", size = 652872, upload-time = "2025-11-18T14:13:10.27Z" }, + { url = "https://files.pythonhosted.org/packages/2b/d0/2938dc0a92b16e899735e706e0d0c18b5d25b30555e06a7d3765a9d7733d/pyplatec-1.4.3-cp39-cp39-win_amd64.whl", hash = "sha256:6d6b45a6414bd4389819366607ca292673ab4dfea9945e9f714421f467479aea", size = 52694, upload-time = "2025-11-18T14:13:11.643Z" }, ] [[package]] @@ -1896,7 +1896,7 @@ requires-dist = [ { name = "numpy", specifier = ">=1.24.0" }, { name = "pre-commit", marker = "extra == 'dev'", specifier = ">=3.5.0" }, { name = "protobuf", specifier = ">=4.21.0" }, - { name = "pyplatec", specifier = "==1.4.2" }, + { name = "pyplatec", specifier = "==1.4.3" }, { name = "pypng", specifier = ">=0.20220715.0" }, { name = "pytest", marker = "extra == 'dev'", specifier = ">=7.4.0" }, { name = "pytest-cov", marker = "extra == 'dev'", specifier = ">=4.1.0" }, diff --git a/worldengine/cli/main.py b/worldengine/cli/main.py index 51b47424..46f6b2d2 100644 --- a/worldengine/cli/main.py +++ b/worldengine/cli/main.py @@ -392,7 +392,7 @@ def main(): "--ocean_level", dest="ocean_level", type=float, - help='elevation cut off for sea level " +' "[default = %(default)s]", + help='elevation cut off for sea level " +[default = %(default)s]', metavar="N", default=1.0, )