diff --git a/.github/workflows/compile-pypi.yml b/.github/workflows/compile-pypi.yml index f133b2aa..9d9e6616 100644 --- a/.github/workflows/compile-pypi.yml +++ b/.github/workflows/compile-pypi.yml @@ -133,8 +133,7 @@ jobs: run: ls -rthlaR push-nightly: name: Push nightly wheels - if: >- - !github.event.repository.fork && (github.event_name == 'push' && startsWith(github.ref, 'refs/main')) + if: ${{ !github.event.repository.fork && github.event_name == 'push' }} runs-on: ubuntu-latest permissions: id-token: write diff --git a/contrib/clojure/README.md b/contrib/clojure/README.md index c30ba972..4a669aef 100644 --- a/contrib/clojure/README.md +++ b/contrib/clojure/README.md @@ -10,9 +10,9 @@
## Installation - + The recommended way to run this UI is via the docker container: - + ```bash docker run --rm -p 8420:80 ghcr.io/bentoml/openllm-ui-clojure:0.2.25 ``` diff --git a/hatch.toml b/hatch.toml index f952b0b9..e34bcc24 100644 --- a/hatch.toml +++ b/hatch.toml @@ -19,9 +19,6 @@ dependencies = [ "types-PyYAML", "types-protobuf", ] -pre-install-commands = [ - "pip install -e ./openllm-python", # -] [envs.default.scripts] changelog = "towncrier build --version main --draft" check-stubs = [ diff --git a/hatch_build.py b/hatch_build.py deleted file mode 100644 index 07d2c476..00000000 --- a/hatch_build.py +++ /dev/null @@ -1,7 +0,0 @@ -from __future__ import annotations -import os, typing as t -from hatchling.metadata.plugin.interface import MetadataHookInterface - -class CustomMetadataHook(MetadataHookInterface): - def update(self, metadata: dict[str, t.Any]) -> None: - if os.environ.get("HATCH_ENV_ACTIVE", "not-dev") != "dev": metadata["dependencies"] = [f"openllm[opt,chatglm,fine-tune]=={metadata['version']}"] diff --git a/openllm-python/.python-version-default b/openllm-python/.python-version-default new file mode 120000 index 00000000..40488ba7 --- /dev/null +++ b/openllm-python/.python-version-default @@ -0,0 +1 @@ +../.python-version-default \ No newline at end of file diff --git a/openllm-python/pyproject.toml b/openllm-python/pyproject.toml index 19bb03a3..206ebfb7 100644 --- a/openllm-python/pyproject.toml +++ b/openllm-python/pyproject.toml @@ -156,7 +156,12 @@ allow-direct-references = true only-include = ["src/openllm"] sources = ["src"] [tool.hatch.build.targets.sdist] -exclude = ["/.git_archival.txt", "tests"] +exclude = [ + "/.git_archival.txt", + "tests", + "/.python-version-default", + "ADDING_NEW_MODEL.md", +] [tool.hatch.build.targets.wheel.hooks.mypyc] dependencies = [ "hatch-mypyc==0.16.0", diff --git a/pyproject.toml b/pyproject.toml index 704eb2e3..2c427fb3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -69,14 +69,6 @@ History = "https://github.com/bentoml/OpenLLM/blob/main/CHANGELOG.md" Homepage = "https://bentoml.com" Tracker = "https://github.com/bentoml/OpenLLM/issues" Twitter = "https://twitter.com/bentomlai" - -[tool.hatch.build] -exclude = ["*"] -dev-mode-dirs = ["openllm-python"] -[tool.hatch.build.sources] -"openllm-python/src/openllm" = "openllm" -[tool.hatch.metadata.hooks.custom] - [tool.hatch.version] fallback-version = "0.0.0" source = "vcs" @@ -309,7 +301,7 @@ python_files = ["test_*.py", "*_test.py"] testpaths = ["openllm-python/tests"] [tool.coverage.paths] -openllm = ["src/openllm", "*/openllm/src/openllm"] +openllm = ["openllm-python/src/openllm", "*/openllm-python/src/openllm"] [tool.coverage.run] branch = true omit = [