reintroduce public nebari package

nebari-dev · May 30, 2023 · cf2cac9 · cf2cac9
1 parent 9ca2bb2
commit cf2cac9
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 25 deletions.
diff --git a/.github/workflows/kubernetes_test.yaml b/.github/workflows/kubernetes_test.yaml
@@ -8,7 +8,7 @@ on:
       - "tests_deployment/**"
       - "tests_e2e/**"
       - "scripts/**"
-      - "src/_nebari/**"
+      - "src/**"
       - "pyproject.toml"
       - "pytest.ini"
   push:
@@ -22,7 +22,7 @@ on:
       - "tests_deployment/**"
       - "tests_e2e/**"
       - "scripts/**"
-      - "src/_nebari/**"
+      - "src/**"
       - "pyproject.toml"
       - "pytest.ini"
   workflow_call:

diff --git a/.github/workflows/test-provider.yaml b/.github/workflows/test-provider.yaml
@@ -8,7 +8,7 @@ on:
       - "tests_deployment/**"
       - "tests_e2e/**"
       - "scripts/**"
-      - "src/_nebari/**"
+      - "src/**"
       - "pyproject.toml"
   push:
     branches:
@@ -21,7 +21,7 @@ on:
       - "tests_deployment/**"
       - "tests_e2e/**"
       - "scripts/**"
-      - "src/_nebari/**"
+      - "src/**"
       - "pyproject.toml"
   workflow_call:
     inputs:

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -8,7 +8,7 @@ on:
       - "tests_deployment/**"
       - "tests_e2e/**"
       - "scripts/**"
-      - "src/_nebari/**"
+      - "src/**"
       - "pyproject.toml"
       - "pytest.ini"
   push:
@@ -22,7 +22,7 @@ on:
       - "tests_deployment/**"
       - "tests_e2e/**"
       - "scripts/**"
-      - "src/_nebari/**"
+      - "src/**"
       - "pyproject.toml"
       - "pytest.ini"
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,10 @@ requires = ["hatchling", "hatch-vcs"]
 build-backend = "hatchling.build"
 
 [tool.hatch.build.targets.wheel]
-packages = ["src/_nebari"]
+packages = [
+    "src/_nebari",
+    "src/nebari",
+]
 
 [tool.hatch.version]
 source = "vcs"

diff --git a/src/_nebari/__main__.py b/src/_nebari/__main__.py
diff --git a/src/nebari/__init__.py b/src/nebari/__init__.py
diff --git a/src/nebari/__main__.py b/src/nebari/__main__.py
@@ -0,0 +1,6 @@
+import sys
+
+from _nebari.cli.main import app as main
+
+if __name__ == "__main__":
+    main(sys.argv[1:])
diff --git a/tests/test_cli.py b/tests/test_cli.py
@@ -75,9 +75,7 @@ def run(command):
 
     command = ["nebari", "--version"]
 
-    # FIXME: this is only temporary until we have a toplevel nebari package again
-    # actual = run(["python", "-m", *command])
-    actual = run(["python", "-m", "_nebari", "--version"])
+    actual = run(["python", "-m", *command])
     expected = run(command)
 
     assert actual == expected
diff --git a/tests/test_dependencies.py b/tests/test_dependencies.py
@@ -9,10 +9,6 @@
 
 @pytest.mark.conda
 def test_build_by_conda_forge(tmp_path):
-    # FIXME: temporarily disable this because the conda build tries to import nebari
-    #  which is only available in the next commit
-    return
-
     """
     This test ensures that nebari can be built and packaged by conda-forge.