From 23cb3f062501eba07197e94f70ec2d02ec61a02c Mon Sep 17 00:00:00 2001 From: Brian Grenier Date: Fri, 10 Jan 2025 13:12:09 -0700 Subject: [PATCH] migrate to stable --- emberjson/parser_helper.mojo | 2 +- magic.lock | 242 +++++++++++++++++------------------ mojoproject.toml | 6 +- scripts/publish.sh | 2 +- scripts/templater.py | 11 +- 5 files changed, 132 insertions(+), 131 deletions(-) diff --git a/emberjson/parser_helper.mojo b/emberjson/parser_helper.mojo index 71d01e6..1de15f4 100644 --- a/emberjson/parser_helper.mojo +++ b/emberjson/parser_helper.mojo @@ -6,7 +6,7 @@ from .tables import * from memory import memcpy from memory.unsafe import bitcast -alias BytePtr = UnsafePointer[Byte, mut=False] +alias BytePtr = UnsafePointer[Byte] alias smallest_power: Int64 = -342 alias largest_power: Int64 = 308 diff --git a/magic.lock b/magic.lock index 9513564..f230d97 100644 --- a/magic.lock +++ b/magic.lock @@ -3,7 +3,7 @@ environments: default: channels: - url: https://conda.anaconda.org/conda-forge/ - - url: https://conda.modular.com/max-nightly/ + - url: https://conda.modular.com/max/ packages: linux-64: - conda: https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2 @@ -131,12 +131,12 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-64/lz4-c-1.10.0-h5888daf_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/markdown-it-py-3.0.0-pyhd8ed1ab_1.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/markupsafe-3.0.2-py312h178313f_1.conda - - conda: https://conda.modular.com/max-nightly/noarch/max-25.1.0.dev2025010817-release.conda - - conda: https://conda.modular.com/max-nightly/linux-64/max-core-25.1.0.dev2025010817-release.conda - - conda: https://conda.modular.com/max-nightly/linux-64/max-python-25.1.0.dev2025010817-3.12release.conda - - conda: https://conda.modular.com/max-nightly/noarch/mblack-25.1.0.dev2025010817-release.conda + - conda: https://conda.modular.com/max/noarch/max-24.6.0-release.conda + - conda: https://conda.modular.com/max/linux-64/max-core-24.6.0-release.conda + - conda: https://conda.modular.com/max/linux-64/max-python-24.6.0-3.12release.conda + - conda: https://conda.modular.com/max/noarch/mblack-24.6.0-release.conda - conda: https://conda.anaconda.org/conda-forge/noarch/mdurl-0.1.2-pyhd8ed1ab_1.conda - - conda: https://conda.modular.com/max-nightly/noarch/mojo-jupyter-25.1.0.dev2025010817-release.conda + - conda: https://conda.modular.com/max/noarch/mojo-jupyter-24.6.0-release.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/multidict-6.1.0-py312h178313f_2.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/multiprocess-0.70.15-py312h98912ed_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/mypy_extensions-1.0.0-pyha770c72_1.conda @@ -164,7 +164,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-64/pyarrow-18.1.0-py312h7900ff3_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/pyarrow-core-18.1.0-py312h01725c0_0_cpu.conda - conda: https://conda.anaconda.org/conda-forge/noarch/pycparser-2.22-pyh29332c3_1.conda - - conda: https://conda.anaconda.org/conda-forge/noarch/pydantic-2.10.4-pyh3cfb1c2_0.conda + - conda: https://conda.anaconda.org/conda-forge/noarch/pydantic-2.10.5-pyh3cfb1c2_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/pydantic-core-2.27.2-py312h12e396e_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/pydantic-settings-2.7.1-pyh3cfb1c2_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/pygments-2.19.1-pyhd8ed1ab_0.conda @@ -188,7 +188,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/rich-13.9.4-pyhd8ed1ab_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/rich-toolkit-0.11.3-pyh29332c3_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/s2n-1.5.10-hb5b8611_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/safetensors-0.5.1-py312h12e396e_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/safetensors-0.5.2-py312h12e396e_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/shellingham-1.5.4-pyhd8ed1ab_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/six-1.17.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/snappy-1.2.1-h8bd8927_1.conda @@ -200,7 +200,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-64/tornado-6.4.2-py312h66e93f0_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/tqdm-4.67.1-pyhd8ed1ab_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/traitlets-5.14.3-pyhd8ed1ab_1.conda - - conda: https://conda.anaconda.org/conda-forge/noarch/transformers-4.47.1-pyhd8ed1ab_0.conda + - conda: https://conda.anaconda.org/conda-forge/noarch/transformers-4.48.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/typer-0.15.1-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/typer-slim-0.15.1-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/typer-slim-standard-0.15.1-hd8ed1ab_0.conda @@ -349,12 +349,12 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-aarch64/lz4-c-1.10.0-h5ad3122_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/markdown-it-py-3.0.0-pyhd8ed1ab_1.conda - conda: https://conda.anaconda.org/conda-forge/linux-aarch64/markupsafe-3.0.2-py312h74ce7d3_1.conda - - conda: https://conda.modular.com/max-nightly/noarch/max-25.1.0.dev2025010817-release.conda - - conda: https://conda.modular.com/max-nightly/linux-aarch64/max-core-25.1.0.dev2025010817-release.conda - - conda: https://conda.modular.com/max-nightly/linux-aarch64/max-python-25.1.0.dev2025010817-3.12release.conda - - conda: https://conda.modular.com/max-nightly/noarch/mblack-25.1.0.dev2025010817-release.conda + - conda: https://conda.modular.com/max/noarch/max-24.6.0-release.conda + - conda: https://conda.modular.com/max/linux-aarch64/max-core-24.6.0-release.conda + - conda: https://conda.modular.com/max/linux-aarch64/max-python-24.6.0-3.12release.conda + - conda: https://conda.modular.com/max/noarch/mblack-24.6.0-release.conda - conda: https://conda.anaconda.org/conda-forge/noarch/mdurl-0.1.2-pyhd8ed1ab_1.conda - - conda: https://conda.modular.com/max-nightly/noarch/mojo-jupyter-25.1.0.dev2025010817-release.conda + - conda: https://conda.modular.com/max/noarch/mojo-jupyter-24.6.0-release.conda - conda: https://conda.anaconda.org/conda-forge/linux-aarch64/multidict-6.1.0-py312hcc812fe_2.conda - conda: https://conda.anaconda.org/conda-forge/linux-aarch64/multiprocess-0.70.15-py312hdd3e373_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/mypy_extensions-1.0.0-pyha770c72_1.conda @@ -382,7 +382,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-aarch64/pyarrow-18.1.0-py312h8025657_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-aarch64/pyarrow-core-18.1.0-py312h66f7834_0_cpu.conda - conda: https://conda.anaconda.org/conda-forge/noarch/pycparser-2.22-pyh29332c3_1.conda - - conda: https://conda.anaconda.org/conda-forge/noarch/pydantic-2.10.4-pyh3cfb1c2_0.conda + - conda: https://conda.anaconda.org/conda-forge/noarch/pydantic-2.10.5-pyh3cfb1c2_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-aarch64/pydantic-core-2.27.2-py312h8cbf658_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/pydantic-settings-2.7.1-pyh3cfb1c2_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/pygments-2.19.1-pyhd8ed1ab_0.conda @@ -406,7 +406,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/rich-13.9.4-pyhd8ed1ab_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/rich-toolkit-0.11.3-pyh29332c3_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-aarch64/s2n-1.5.10-h5df210e_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-aarch64/safetensors-0.5.1-py312h8cbf658_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-aarch64/safetensors-0.5.2-py312h8cbf658_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/shellingham-1.5.4-pyhd8ed1ab_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/six-1.17.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-aarch64/snappy-1.2.1-hd4fb6f5_1.conda @@ -418,7 +418,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-aarch64/tornado-6.4.2-py312h52516f5_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/tqdm-4.67.1-pyhd8ed1ab_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/traitlets-5.14.3-pyhd8ed1ab_1.conda - - conda: https://conda.anaconda.org/conda-forge/noarch/transformers-4.47.1-pyhd8ed1ab_0.conda + - conda: https://conda.anaconda.org/conda-forge/noarch/transformers-4.48.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/typer-0.15.1-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/typer-slim-0.15.1-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/typer-slim-standard-0.15.1-hd8ed1ab_0.conda @@ -558,12 +558,12 @@ environments: - conda: https://conda.anaconda.org/conda-forge/osx-arm64/lz4-c-1.10.0-h286801f_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/markdown-it-py-3.0.0-pyhd8ed1ab_1.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/markupsafe-3.0.2-py312h998013c_1.conda - - conda: https://conda.modular.com/max-nightly/noarch/max-25.1.0.dev2025010817-release.conda - - conda: https://conda.modular.com/max-nightly/osx-arm64/max-core-25.1.0.dev2025010817-release.conda - - conda: https://conda.modular.com/max-nightly/osx-arm64/max-python-25.1.0.dev2025010817-3.12release.conda - - conda: https://conda.modular.com/max-nightly/noarch/mblack-25.1.0.dev2025010817-release.conda + - conda: https://conda.modular.com/max/noarch/max-24.6.0-release.conda + - conda: https://conda.modular.com/max/osx-arm64/max-core-24.6.0-release.conda + - conda: https://conda.modular.com/max/osx-arm64/max-python-24.6.0-3.12release.conda + - conda: https://conda.modular.com/max/noarch/mblack-24.6.0-release.conda - conda: https://conda.anaconda.org/conda-forge/noarch/mdurl-0.1.2-pyhd8ed1ab_1.conda - - conda: https://conda.modular.com/max-nightly/noarch/mojo-jupyter-25.1.0.dev2025010817-release.conda + - conda: https://conda.modular.com/max/noarch/mojo-jupyter-24.6.0-release.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/multidict-6.1.0-py312hdb8e49c_1.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/multiprocess-0.70.15-py312h02f2b3b_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/mypy_extensions-1.0.0-pyha770c72_1.conda @@ -591,7 +591,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/osx-arm64/pyarrow-18.1.0-py312h1f38498_0.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/pyarrow-core-18.1.0-py312hc40f475_0_cpu.conda - conda: https://conda.anaconda.org/conda-forge/noarch/pycparser-2.22-pyh29332c3_1.conda - - conda: https://conda.anaconda.org/conda-forge/noarch/pydantic-2.10.4-pyh3cfb1c2_0.conda + - conda: https://conda.anaconda.org/conda-forge/noarch/pydantic-2.10.5-pyh3cfb1c2_0.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/pydantic-core-2.27.2-py312hcd83bfe_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/pydantic-settings-2.7.1-pyh3cfb1c2_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/pygments-2.19.1-pyhd8ed1ab_0.conda @@ -614,7 +614,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/requests-2.32.3-pyhd8ed1ab_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/rich-13.9.4-pyhd8ed1ab_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/rich-toolkit-0.11.3-pyh29332c3_0.conda - - conda: https://conda.anaconda.org/conda-forge/osx-arm64/safetensors-0.5.1-py312hcd83bfe_0.conda + - conda: https://conda.anaconda.org/conda-forge/osx-arm64/safetensors-0.5.2-py312hcd83bfe_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/shellingham-1.5.4-pyhd8ed1ab_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/six-1.17.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/snappy-1.2.1-h98b9ce2_1.conda @@ -626,7 +626,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/osx-arm64/tornado-6.4.2-py312hea69d52_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/tqdm-4.67.1-pyhd8ed1ab_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/traitlets-5.14.3-pyhd8ed1ab_1.conda - - conda: https://conda.anaconda.org/conda-forge/noarch/transformers-4.47.1-pyhd8ed1ab_0.conda + - conda: https://conda.anaconda.org/conda-forge/noarch/transformers-4.48.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/typer-0.15.1-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/typer-slim-0.15.1-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/typer-slim-standard-0.15.1-hd8ed1ab_0.conda @@ -5908,76 +5908,76 @@ packages: timestamp: 1733219945697 - kind: conda name: max - version: 25.1.0.dev2025010817 + version: 24.6.0 build: release subdir: noarch noarch: python - url: https://conda.modular.com/max-nightly/noarch/max-25.1.0.dev2025010817-release.conda - sha256: 4ce81189e26dd06f188129580db0464f8ee9a081e195dad7082b2fa25fcf738e - md5: b46d770a5f45597ffc008bd224d8e91c - depends: - - max-core ==25.1.0.dev2025010817 release - - max-python >=25.1.0.dev2025010817,<26.0a0 - - mojo-jupyter ==25.1.0.dev2025010817 release - - mblack ==25.1.0.dev2025010817 release + url: https://conda.modular.com/max/noarch/max-24.6.0-release.conda + sha256: 0e3c1984ac7476550fd8fa5921bf1ca58950219b84ae21ecd861f650e45382ac + md5: e04b1405f630c9bb7d4cb5559840e902 + depends: + - max-core ==24.6.0 release + - max-python >=24.6.0,<25.0a0 + - mojo-jupyter ==24.6.0 release + - mblack ==24.6.0 release license: LicenseRef-Modular-Proprietary - size: 9922 - timestamp: 1736357145809 + size: 9851 + timestamp: 1734039439696 - kind: conda name: max-core - version: 25.1.0.dev2025010817 + version: 24.6.0 build: release subdir: linux-64 - url: https://conda.modular.com/max-nightly/linux-64/max-core-25.1.0.dev2025010817-release.conda - sha256: 5459a1f6c379b01231649212ca7f5062c49208b5c0b2b17047b55011872727c2 - md5: 5bbb293b5216b098c424e7602823a460 + url: https://conda.modular.com/max/linux-64/max-core-24.6.0-release.conda + sha256: 38a4128c15b230f5b05e0606a339c7866a83eb943d334a948b3a8c1d2675a917 + md5: 25e678ff7c59e36ec3154fe0cd15ebde depends: - - mblack ==25.1.0.dev2025010817 release + - mblack ==24.6.0 release arch: x86_64 platform: linux license: LicenseRef-Modular-Proprietary - size: 247646542 - timestamp: 1736357145807 + size: 247670119 + timestamp: 1734039439695 - kind: conda name: max-core - version: 25.1.0.dev2025010817 + version: 24.6.0 build: release subdir: linux-aarch64 - url: https://conda.modular.com/max-nightly/linux-aarch64/max-core-25.1.0.dev2025010817-release.conda - sha256: 18715c3fc8071d5eeb9f1893512fe65967919e9900738423958a5cb4f09148da - md5: 4a7b6e800f8fdabf0498727c1bff57d3 + url: https://conda.modular.com/max/linux-aarch64/max-core-24.6.0-release.conda + sha256: 554f2c1a6ddfab8fabf82b9fbcc1adb87e2a615669793e463f757ea452e02016 + md5: 2ca790aa461fa28722c6f21fcd2af0b9 depends: - - mblack ==25.1.0.dev2025010817 release + - mblack ==24.6.0 release arch: aarch64 platform: linux license: LicenseRef-Modular-Proprietary - size: 251608988 - timestamp: 1736357045232 + size: 251486610 + timestamp: 1734039413769 - kind: conda name: max-core - version: 25.1.0.dev2025010817 + version: 24.6.0 build: release subdir: osx-arm64 - url: https://conda.modular.com/max-nightly/osx-arm64/max-core-25.1.0.dev2025010817-release.conda - sha256: 5a23bdc48d6fe2cfe439097b7a0fc0f1bd2b23be081478638ef4b945267d8015 - md5: 1f54b615e5199ac268f123c89cfbabda + url: https://conda.modular.com/max/osx-arm64/max-core-24.6.0-release.conda + sha256: 434c29e35067e296db55525cd5cf38bb013a1f7a7bfa99845bf6c317de6cdc12 + md5: 4a2ead0a9010c36b6193ea32f583e996 depends: - - mblack ==25.1.0.dev2025010817 release + - mblack ==24.6.0 release arch: arm64 platform: osx license: LicenseRef-Modular-Proprietary - size: 209267317 - timestamp: 1736357278969 + size: 212001240 + timestamp: 1734039726703 - kind: conda name: max-python - version: 25.1.0.dev2025010817 + version: 24.6.0 build: 3.12release subdir: linux-64 - url: https://conda.modular.com/max-nightly/linux-64/max-python-25.1.0.dev2025010817-3.12release.conda - sha256: 7bd73eb5b2c8f796bb2bf947e68b46f9fa0302c1999905321bd18c453be5d410 - md5: 58d7a8476c07a36c0412fcd983faebfc + url: https://conda.modular.com/max/linux-64/max-python-24.6.0-3.12release.conda + sha256: 6fbf7330ad910e6ec9fd581fd0f8505e5b1326ccf9979d553c70c61abf4c3e54 + md5: 218ecd662f853ea1578404799d61b385 depends: - - max-core ==25.1.0.dev2025010817 release + - max-core ==24.6.0 release - python 3.12.* - fastapi - httpx @@ -6000,18 +6000,18 @@ packages: arch: x86_64 platform: linux license: LicenseRef-Modular-Proprietary - size: 124309678 - timestamp: 1736357145817 + size: 123785050 + timestamp: 1734039439704 - kind: conda name: max-python - version: 25.1.0.dev2025010817 + version: 24.6.0 build: 3.12release subdir: linux-aarch64 - url: https://conda.modular.com/max-nightly/linux-aarch64/max-python-25.1.0.dev2025010817-3.12release.conda - sha256: 1faa8dea2f87c25b20f467758a46589d2d464d8367fda4fa7fa61c73120b62f9 - md5: be84f3b39ee757dd73d27ac241c37d5a + url: https://conda.modular.com/max/linux-aarch64/max-python-24.6.0-3.12release.conda + sha256: 15f57cb436b00c510473ca1940edd9ee03df6c92d5b66d616db30a131b768b78 + md5: 97c62f17f0d34787d29128043a593877 depends: - - max-core ==25.1.0.dev2025010817 release + - max-core ==24.6.0 release - python 3.12.* - fastapi - httpx @@ -6034,18 +6034,18 @@ packages: arch: aarch64 platform: linux license: LicenseRef-Modular-Proprietary - size: 128047180 - timestamp: 1736357045243 + size: 127403269 + timestamp: 1734039413779 - kind: conda name: max-python - version: 25.1.0.dev2025010817 + version: 24.6.0 build: 3.12release subdir: osx-arm64 - url: https://conda.modular.com/max-nightly/osx-arm64/max-python-25.1.0.dev2025010817-3.12release.conda - sha256: c8b10ed04f57bc9a9e67d447ad97404ea06f3efbc903dced4723f3828c93ab2c - md5: aa8c692e6393c51283419173f7cb69a2 + url: https://conda.modular.com/max/osx-arm64/max-python-24.6.0-3.12release.conda + sha256: c888b58cfc7c767d40aa100ff2bccf5c3ab11d58d897a6accb749e6b5b7014ea + md5: 62a92bfab3b5c85c2d246672bbb8bc8d depends: - - max-core ==25.1.0.dev2025010817 release + - max-core ==24.6.0 release - python 3.12.* - fastapi - httpx @@ -6068,17 +6068,17 @@ packages: arch: arm64 platform: osx license: LicenseRef-Modular-Proprietary - size: 110680624 - timestamp: 1736357278972 + size: 112484803 + timestamp: 1734039726707 - kind: conda name: mblack - version: 25.1.0.dev2025010817 + version: 24.6.0 build: release subdir: noarch noarch: python - url: https://conda.modular.com/max-nightly/noarch/mblack-25.1.0.dev2025010817-release.conda - sha256: 8bc21a826d3edc5a8719deeeadcee5b3fc8fbd83313ce2c7ebc8c620075608e1 - md5: ee664fe2390706d36d2d60b1f2bd69df + url: https://conda.modular.com/max/noarch/mblack-24.6.0-release.conda + sha256: f135164020478078f4681aa77e7f6ca9f68b8e7ee02604b85342bbaf2f706f0d + md5: 77367aff981ba391ab5c047ba33ec978 depends: - python >=3.9,<3.13 - click >=8.0.0 @@ -6088,8 +6088,8 @@ packages: - platformdirs >=2 - python license: MIT - size: 130813 - timestamp: 1736357145814 + size: 130668 + timestamp: 1734039439700 - kind: conda name: mdurl version: 0.1.2 @@ -6108,21 +6108,21 @@ packages: timestamp: 1733255681319 - kind: conda name: mojo-jupyter - version: 25.1.0.dev2025010817 + version: 24.6.0 build: release subdir: noarch noarch: python - url: https://conda.modular.com/max-nightly/noarch/mojo-jupyter-25.1.0.dev2025010817-release.conda - sha256: a92d02809c43a9a92abc363e69396738f6c9802c12d8827cc008d316cea4e107 - md5: 0533034ac307140f160cf43c5f36b2ed + url: https://conda.modular.com/max/noarch/mojo-jupyter-24.6.0-release.conda + sha256: 2fe043d98ea77f8f165b39bd252cd04942216c8533f0291c49d87d6cfd8673df + md5: b17127f3ca2cef0976496407e1cd4081 depends: - - max-core ==25.1.0.dev2025010817 release + - max-core ==24.6.0 release - python >=3.9,<3.13 - jupyter_client >=8.6.2,<8.7 - python license: LicenseRef-Modular-Proprietary - size: 22926 - timestamp: 1736357145815 + size: 22990 + timestamp: 1734039439702 - kind: conda name: multidict version: 6.1.0 @@ -7171,13 +7171,13 @@ packages: timestamp: 1733195786147 - kind: conda name: pydantic - version: 2.10.4 + version: 2.10.5 build: pyh3cfb1c2_0 subdir: noarch noarch: python - url: https://conda.anaconda.org/conda-forge/noarch/pydantic-2.10.4-pyh3cfb1c2_0.conda - sha256: e68400714532a33f34b44ddaee3e27e8dd6c83c3f31c7892ec10b84d13aa8b59 - md5: 93bccf4d7a58c9140d59491de21e044b + url: https://conda.anaconda.org/conda-forge/noarch/pydantic-2.10.5-pyh3cfb1c2_0.conda + sha256: 0f32c30ddc610cd1113335d8b4f311f20f4d72754b7c1a5d0d9493f597cf11d2 + md5: e8ea30925c8271c4128375810d7d3d7a depends: - annotated-types >=0.6.0 - pydantic-core 2.27.2 @@ -7186,8 +7186,8 @@ packages: - typing_extensions >=4.12.2 license: MIT license_family: MIT - size: 296557 - timestamp: 1734609427697 + size: 296805 + timestamp: 1736458364196 - kind: conda name: pydantic-core version: 2.27.2 @@ -7988,12 +7988,12 @@ packages: timestamp: 1734415467047 - kind: conda name: safetensors - version: 0.5.1 + version: 0.5.2 build: py312h12e396e_0 subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/safetensors-0.5.1-py312h12e396e_0.conda - sha256: 61a4a49bc98a7b529c7c9e2af9be1dc3350b8ea1c78f985e8a051543e8845ffa - md5: 19b54f64e926aca46d0cc2ff0ecf4f34 + url: https://conda.anaconda.org/conda-forge/linux-64/safetensors-0.5.2-py312h12e396e_0.conda + sha256: 98b8dfa5eec083e0b3ace00906a7f7e748b1e2446dca17e87473f43278fcc036 + md5: 999ca9d87d2bb8b4c01e62c755b928cf depends: - __glibc >=2.17,<3.0.a0 - libgcc >=13 @@ -8003,16 +8003,16 @@ packages: - __glibc >=2.17 license: Apache-2.0 license_family: APACHE - size: 424642 - timestamp: 1736278244485 + size: 424409 + timestamp: 1736383159339 - kind: conda name: safetensors - version: 0.5.1 + version: 0.5.2 build: py312h8cbf658_0 subdir: linux-aarch64 - url: https://conda.anaconda.org/conda-forge/linux-aarch64/safetensors-0.5.1-py312h8cbf658_0.conda - sha256: ee66da0efb1d6897ad74156cb115277dfb8ca7f6c8bdfb17bd6a6fb205495622 - md5: f91072f99af78ed0c1941ba5d6f30cf8 + url: https://conda.anaconda.org/conda-forge/linux-aarch64/safetensors-0.5.2-py312h8cbf658_0.conda + sha256: 3e230060c1366cbaf03f4315b021dfe47f5147f3af88f17975d661c08fe15ad3 + md5: 2c77c961c4e813b1d05122ac4d803d80 depends: - libgcc >=13 - python >=3.12,<3.13.0a0 @@ -8022,16 +8022,16 @@ packages: - __glibc >=2.17 license: Apache-2.0 license_family: APACHE - size: 409549 - timestamp: 1736278357702 + size: 408166 + timestamp: 1736383184569 - kind: conda name: safetensors - version: 0.5.1 + version: 0.5.2 build: py312hcd83bfe_0 subdir: osx-arm64 - url: https://conda.anaconda.org/conda-forge/osx-arm64/safetensors-0.5.1-py312hcd83bfe_0.conda - sha256: e61cbac0c1b38731543a600e2e40c4cc686e5e565f6c9809d5dcc467e2e8f220 - md5: d12e134445366752e52acec1a86c845f + url: https://conda.anaconda.org/conda-forge/osx-arm64/safetensors-0.5.2-py312hcd83bfe_0.conda + sha256: 0aeb3e654095ca0261d560d1fc05912d0e94d547a7dc435d7f4cedeba966d176 + md5: fc0383682805e293eba9b8afc9ad0931 depends: - __osx >=11.0 - python >=3.12,<3.13.0a0 @@ -8041,8 +8041,8 @@ packages: - __osx >=11.0 license: Apache-2.0 license_family: APACHE - size: 378562 - timestamp: 1736278448037 + size: 378060 + timestamp: 1736383410115 - kind: conda name: shellingham version: 1.5.4 @@ -8369,13 +8369,13 @@ packages: timestamp: 1733367480074 - kind: conda name: transformers - version: 4.47.1 + version: 4.48.0 build: pyhd8ed1ab_0 subdir: noarch noarch: python - url: https://conda.anaconda.org/conda-forge/noarch/transformers-4.47.1-pyhd8ed1ab_0.conda - sha256: df8238c3cccbb6bb1d5657e6a75977ac0b832ab61155d5e3d8560c1c4f52abeb - md5: 931d66db156680c42c62812d6533cbf7 + url: https://conda.anaconda.org/conda-forge/noarch/transformers-4.48.0-pyhd8ed1ab_0.conda + sha256: c8dd6d69e4ef67c7d507dec2be4b6964f6ddbe1ce35a822ddf4089505d702f33 + md5: 2c57d4af7b8952484962b40a59cf1537 depends: - datasets !=2.5.0 - filelock @@ -8391,8 +8391,8 @@ packages: - tqdm >=4.27 license: Apache-2.0 license_family: APACHE - size: 3680276 - timestamp: 1734499046193 + size: 3408277 + timestamp: 1736534112195 - kind: conda name: typer version: 0.15.1 diff --git a/mojoproject.toml b/mojoproject.toml index 5af47bc..e459d2a 100644 --- a/mojoproject.toml +++ b/mojoproject.toml @@ -1,6 +1,6 @@ [project] authors = ["Brian Grenier "] -channels = ["conda-forge", "https://conda.modular.com/max-nightly/"] +channels = ["conda-forge", "https://conda.modular.com/max/"] description = "A json library for Mojo" name = "emberjson" platforms = ["osx-arm64", "linux-aarch64", "linux-64"] @@ -11,7 +11,7 @@ homepage = "https://github.com/bgreni/EmberJson" repository = "https://github.com/bgreni/EmberJson" [tasks] -build = { cmd = "magic run template && rattler-build build --recipe recipes -c https://conda.modular.com/max-nightly -c conda-forge --skip-existing=all", env = {MODULAR_MOJO_IMPORT_PATH = "$CONDA_PREFIX/lib/mojo"} } +build = { cmd = "magic run template && rattler-build build --recipe recipes -c https://conda.modular.com/max -c conda-forge --skip-existing=all", env = {MODULAR_MOJO_IMPORT_PATH = "$CONDA_PREFIX/lib/mojo"} } template = { cmd = "magic run python3 scripts/templater.py" } format = { cmd = "magic run mojo format -l 120 emberjson" } test = { cmd = "magic run clean ; magic run mojo test" } @@ -22,4 +22,4 @@ publish = { cmd = "./scripts/publish.sh", env = { PREFIX_API_KEY = "$PREFIX_API_ precommit = { cmd = "magic run format && magic run test" } [dependencies] -max = ">=25.1.0.dev2024122105, <=26" \ No newline at end of file +max = "24.6.0" \ No newline at end of file diff --git a/scripts/publish.sh b/scripts/publish.sh index a70a368..e651c9f 100755 --- a/scripts/publish.sh +++ b/scripts/publish.sh @@ -12,7 +12,7 @@ CONDA_BLD_PATH="output" (magic run clean ; magic run update_and_build) || exit 1 for file in "$CONDA_BLD_PATH"/**/*.conda; do - magic run rattler-build upload prefix -c "mojo-community-nightly" "$file" || (echo "upload failed" && exit 1) + magic run rattler-build upload prefix -c "mojo-community" "$file" || (echo "upload failed" && exit 1) done magic run clean diff --git a/scripts/templater.py b/scripts/templater.py index 8414df4..e3e3407 100644 --- a/scripts/templater.py +++ b/scripts/templater.py @@ -59,11 +59,12 @@ def main(): out = subprocess.check_output("magic list --json", shell=True) j = json.loads(out) - max_version = '' - for res in j: - if res['name'] == 'max': - max_version = re.search("(dev.*)", res["version"])[1] - recipe = recipe.replace("{{VERSION}}", config["project"]["version"] + "." + max_version) + # max_version = '' + # for res in j: + # if res['name'] == 'max': + # max_version = re.search("(dev.*)", res["version"])[1] + # recipe = recipe.replace("{{VERSION}}", config["project"]["version"] + "." + max_version) + recipe = recipe.replace("{{VERSION}}", config["project"]["version"]) deps = build_dependency_list(config['dependencies']) recipe = recipe.replace("{{DEPENDENCIES}}", deps)