From 34d098291648ad46d245a8f7c97d67ba82dc595d Mon Sep 17 00:00:00 2001 From: Benjamin Bolte Date: Sun, 10 Nov 2024 00:45:29 -0800 Subject: [PATCH] kscaleos -> kos --- .github/workflows/publish.yml | 2 +- Cargo.toml | 8 ++++---- MANIFEST.in | 2 +- {kscaleos => kos}/__init__.py | 0 {kscaleos => kos}/bindings/Cargo.toml | 0 {kscaleos => kos}/bindings/bindings.pyi | 0 {kscaleos => kos}/bindings/pyproject.toml | 0 .../bindings/src/bin/hello_world.rs | 0 {kscaleos => kos}/bindings/src/bin/stub_gen.rs | 0 {kscaleos => kos}/bindings/src/lib.rs | 0 {kscaleos => kos}/kos/Cargo.toml | 0 kos/kos/src/bin/run.rs | 5 +++++ {kscaleos => kos}/kos/src/config.rs | 0 {kscaleos => kos}/kos/src/lib.rs | 0 {kscaleos => kos}/kos/src/runner.rs | 0 {kscaleos => kos}/kos/src/state.rs | 0 {kscaleos => kos}/py.typed | 0 {kscaleos => kos}/requirements-dev.txt | 0 {kscaleos => kos}/requirements.txt | 0 kscaleos/kos/src/bin/run.rs | 5 ----- pyproject.toml | 2 +- setup.py | 18 +++++++++--------- 22 files changed, 21 insertions(+), 21 deletions(-) rename {kscaleos => kos}/__init__.py (100%) rename {kscaleos => kos}/bindings/Cargo.toml (100%) rename {kscaleos => kos}/bindings/bindings.pyi (100%) rename {kscaleos => kos}/bindings/pyproject.toml (100%) rename {kscaleos => kos}/bindings/src/bin/hello_world.rs (100%) rename {kscaleos => kos}/bindings/src/bin/stub_gen.rs (100%) rename {kscaleos => kos}/bindings/src/lib.rs (100%) rename {kscaleos => kos}/kos/Cargo.toml (100%) create mode 100644 kos/kos/src/bin/run.rs rename {kscaleos => kos}/kos/src/config.rs (100%) rename {kscaleos => kos}/kos/src/lib.rs (100%) rename {kscaleos => kos}/kos/src/runner.rs (100%) rename {kscaleos => kos}/kos/src/state.rs (100%) rename {kscaleos => kos}/py.typed (100%) rename {kscaleos => kos}/requirements-dev.txt (100%) rename {kscaleos => kos}/requirements.txt (100%) delete mode 100644 kscaleos/kos/src/bin/run.rs diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index c0510f5..6c3c3a3 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -20,7 +20,7 @@ jobs: # We don't need to run on all platforms since this package is # platform-agnostic. The output wheel is something like - # "kscaleos--py3-none-any.whl". + # "kos--py3-none-any.whl". runs-on: ubuntu-latest steps: diff --git a/Cargo.toml b/Cargo.toml index 9ab529b..ea029b1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,8 +1,8 @@ [workspace] members = [ - "kscaleos/bindings", - "kscaleos/kos", + "kos/bindings", + "kos/kos", ] resolver = "2" @@ -12,7 +12,7 @@ version = "0.1.0" authors = ["Wesley Maa ", "Pawel Budzianowski ", "Benjamin Bolte "] edition = "2021" license = "MIT" -repository = "https://github.com/kscalelabs/kscaleos" +repository = "https://github.com/kscalelabs/kos" description = "The K-Scale Operating System" -documentation = "https://docs.kscale.dev/kscaleos/intro" +documentation = "https://docs.kscale.dev/kos/intro" readme = "README.md" diff --git a/MANIFEST.in b/MANIFEST.in index 0d8aa9d..aefc580 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1 +1 @@ -recursive-include kscaleos/ *.py *.txt py.typed MANIFEST.in +recursive-include kos/ *.py *.txt py.typed MANIFEST.in diff --git a/kscaleos/__init__.py b/kos/__init__.py similarity index 100% rename from kscaleos/__init__.py rename to kos/__init__.py diff --git a/kscaleos/bindings/Cargo.toml b/kos/bindings/Cargo.toml similarity index 100% rename from kscaleos/bindings/Cargo.toml rename to kos/bindings/Cargo.toml diff --git a/kscaleos/bindings/bindings.pyi b/kos/bindings/bindings.pyi similarity index 100% rename from kscaleos/bindings/bindings.pyi rename to kos/bindings/bindings.pyi diff --git a/kscaleos/bindings/pyproject.toml b/kos/bindings/pyproject.toml similarity index 100% rename from kscaleos/bindings/pyproject.toml rename to kos/bindings/pyproject.toml diff --git a/kscaleos/bindings/src/bin/hello_world.rs b/kos/bindings/src/bin/hello_world.rs similarity index 100% rename from kscaleos/bindings/src/bin/hello_world.rs rename to kos/bindings/src/bin/hello_world.rs diff --git a/kscaleos/bindings/src/bin/stub_gen.rs b/kos/bindings/src/bin/stub_gen.rs similarity index 100% rename from kscaleos/bindings/src/bin/stub_gen.rs rename to kos/bindings/src/bin/stub_gen.rs diff --git a/kscaleos/bindings/src/lib.rs b/kos/bindings/src/lib.rs similarity index 100% rename from kscaleos/bindings/src/lib.rs rename to kos/bindings/src/lib.rs diff --git a/kscaleos/kos/Cargo.toml b/kos/kos/Cargo.toml similarity index 100% rename from kscaleos/kos/Cargo.toml rename to kos/kos/Cargo.toml diff --git a/kos/kos/src/bin/run.rs b/kos/kos/src/bin/run.rs new file mode 100644 index 0000000..94c62b8 --- /dev/null +++ b/kos/kos/src/bin/run.rs @@ -0,0 +1,5 @@ +use kos::main as kos_main; + +fn main() { + kos_main(); +} diff --git a/kscaleos/kos/src/config.rs b/kos/kos/src/config.rs similarity index 100% rename from kscaleos/kos/src/config.rs rename to kos/kos/src/config.rs diff --git a/kscaleos/kos/src/lib.rs b/kos/kos/src/lib.rs similarity index 100% rename from kscaleos/kos/src/lib.rs rename to kos/kos/src/lib.rs diff --git a/kscaleos/kos/src/runner.rs b/kos/kos/src/runner.rs similarity index 100% rename from kscaleos/kos/src/runner.rs rename to kos/kos/src/runner.rs diff --git a/kscaleos/kos/src/state.rs b/kos/kos/src/state.rs similarity index 100% rename from kscaleos/kos/src/state.rs rename to kos/kos/src/state.rs diff --git a/kscaleos/py.typed b/kos/py.typed similarity index 100% rename from kscaleos/py.typed rename to kos/py.typed diff --git a/kscaleos/requirements-dev.txt b/kos/requirements-dev.txt similarity index 100% rename from kscaleos/requirements-dev.txt rename to kos/requirements-dev.txt diff --git a/kscaleos/requirements.txt b/kos/requirements.txt similarity index 100% rename from kscaleos/requirements.txt rename to kos/requirements.txt diff --git a/kscaleos/kos/src/bin/run.rs b/kscaleos/kos/src/bin/run.rs deleted file mode 100644 index 803bb06..0000000 --- a/kscaleos/kos/src/bin/run.rs +++ /dev/null @@ -1,5 +0,0 @@ -use kos::main as kscaleos_main; - -fn main() { - kscaleos_main(); -} diff --git a/pyproject.toml b/pyproject.toml index 79ed040..6dd28ae 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -67,7 +67,7 @@ dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$" [tool.ruff.lint.isort] -known-first-party = ["kscaleos", "tests"] +known-first-party = ["kos", "tests"] combine-as-imports = true [tool.ruff.lint.pydocstyle] diff --git a/setup.py b/setup.py index e6f55a5..27c388a 100644 --- a/setup.py +++ b/setup.py @@ -13,17 +13,17 @@ long_description: str = f.read() -with open("kscaleos/requirements.txt", "r", encoding="utf-8") as f: +with open("kos/requirements.txt", "r", encoding="utf-8") as f: requirements: list[str] = f.read().splitlines() -with open("kscaleos/requirements-dev.txt", "r", encoding="utf-8") as f: +with open("kos/requirements-dev.txt", "r", encoding="utf-8") as f: requirements_dev: list[str] = f.read().splitlines() -with open("kscaleos/__init__.py", "r", encoding="utf-8") as fh: +with open("kos/__init__.py", "r", encoding="utf-8") as fh: version_re = re.search(r"^__version__ = \"([^\"]*)\"", fh.read(), re.MULTILINE) -assert version_re is not None, "Could not find version in kscaleos/__init__.py" +assert version_re is not None, "Could not find version in kos/__init__.py" version: str = version_re.group(1) @@ -36,15 +36,15 @@ def run(self) -> None: setup( - name="kscaleos", + name="pykos", version=version, description="The K-Scale Operating System", author="Benjamin Bolte", - url="https://github.com/kscalelabs/kscaleos", + url="https://github.com/kscalelabs/kos", rust_extensions=[ RustExtension( - target="kscaleos.bindings", - path="kscaleos/bindings/Cargo.toml", + target="kos.bindings", + path="kos/bindings/Cargo.toml", binding=Binding.PyO3, ), ], @@ -55,6 +55,6 @@ def run(self) -> None: install_requires=requirements, tests_require=requirements_dev, extras_require={"dev": requirements_dev}, - packages=find_packages(include=["kscaleos"]), + packages=find_packages(include=["kos"]), cmdclass={"build_ext": RustBuildExt}, )