Fixes before release (#77)

* fix

Signed-off-by: SumanthRH <[email protected]>

* rework dependencies; fix openai stuff

Signed-off-by: SumanthRH <[email protected]>

* move skythought_evals to evals/

Signed-off-by: SumanthRH <[email protected]>


* fix pyproject.toml before release

Signed-off-by: SumanthRH <[email protected]>

* lint

Signed-off-by: SumanthRH <[email protected]>

---------

Signed-off-by: SumanthRH <[email protected]>

Author: SumanthRH

.pre-commit-config.yaml

@@ -5,12 +5,12 @@ repos:
       - id: ruff
         args: [ --fix, --exit-non-zero-on-fix ]
         # NOTE (sumanthrh): Many of the files excluded here are used for validating code generation, and linters do not recognize some of the logic in these files. skythought/train is excluded for now because it's a fork of Llamafactory
-        exclude: (^skythought/train/.*|^skythought/skythought-rl/.*|skythought_evals/tasks/taco/pyext2\.py|skythought_evals/tasks/taco/taco_util\.py|skythought_evals/tasks/apps/apps_util\.py|scripts/prompts\.py)$
+        exclude: (^skythought/train/.*|^skythought/skythought-rl/.*|tasks/taco/pyext2\.py|tasks/taco/taco_util\.py|tasks/apps/apps_util\.py|scripts/prompts\.py)$
 
 
   # Black needs to be ran after ruff with --fix
   - repo: https://github.com/psf/black
     rev: 24.10.0
     hooks:
       - id: black
-        exclude: (^skythought/train/.*|^skythought/skythought-rl/.*|skythought_evals/tasks/taco/pyext2\.py)$
+        exclude: (^skythought/train/.*|^skythought/skythought-rl/.*|tasks/taco/pyext2\.py)$

README.md

@@ -1,11 +1,11 @@
 [project]
 name = "skythought"
 version = "0.1.0"
-description = "Skythought Evals"
+description = "Skythought Evals: Evaluation and Data Generation Tools for Reasoning Models"
 authors = [
-    { name = "NovaSky Team"}
+    { name = "NovaSky Team" }
 ]
-requires-python = ">=3.9,<=3.10"  # pyext requires 3.10 or below
+requires-python = ">=3.9,<3.11"
 dependencies = [
     "vllm==0.7.0",
     "pyext",
@@ -17,24 +17,38 @@ dependencies = [
     "setuptools",
     "typer",
 ]
+license = { text = "Apache-2.0" }
+readme = "README.md"
+
+[project.urls]
+Repository = "https://github.com/NovaSky-AI/SkyThought"
+
+[build-system]
+requires = ["setuptools>=61", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[tool.setuptools]
+include-package-data = true  # Ensures package_data is included in wheel
 
 [tool.setuptools.packages.find]
-where = ["skythought"]
-include = ["skythought_evals*"]
+where = ["."]
+include = [
+    "skythought",          # top-level package
+    "skythought.evals*"    # subpackage(s) under skythought/evals
+]
 
 [tool.setuptools.package-data]
-skythought_evals = ["*.yaml", "*.yml"]  # Include all YAML files
-
+skythought = ["evals/**/*.yaml", "evals/**/*.yml"]
 
 [project.scripts]
-skythought = "skythought_evals.cli:main"
+skythought = "skythought.evals.cli:main"
+
+[project.optional-dependencies]
+dev = ["pytest", "pytest-mock", "black", "ruff", "pre-commit"]
 
 [tool.ruff]
 line-length = 160
 
 [tool.ruff.lint]
 extend-select = ["E", "F", "I", "ASYNC", "B"]
 ignore = ["F811", "B006"]
-
-[project.optional-dependencies]
-dev = ["pytest", "pytest-mock", "black", "ruff", "pre-commit"]