Update CI to use keras-core from pypi

keras-team · Jul 10, 2023 · c278eb8 · c278eb8
1 parent 0bf113c
commit c278eb8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 19 deletions.
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -37,16 +37,8 @@ jobs:
         env:
             SSH_AUTH_SOCK: /tmp/ssh_agent.sock
         run: |
-          pip install tensorflow==2.12.0
-          pip install torch>=2.0.1+cpu
-          pip install "jax[cpu]"
           pip install -r requirements.txt --progress-bar off
-          pip install -e "." --progress-bar off
-          cd ..
-          git clone git@github.com:keras-team/keras-core.git
-          pip install -r keras-core/requirements.txt --progress-bar off
-          python keras-core/pip_build.py --install
-          cd keras-nlp
+          pip install --no-deps -e "." --progress-bar off
       - name: Test with pytest
         run: |
           pytest --cov=keras_nlp --cov-report xml:coverage.xml keras_nlp/
@@ -88,16 +80,8 @@ jobs:
       env:
           SSH_AUTH_SOCK: /tmp/ssh_agent.sock
       run: |
-          pip install tensorflow==2.12.0
-          pip install torch>=2.0.1+cpu
-          pip install "jax[cpu]"
           pip install -r requirements.txt --progress-bar off
-          pip install -e "." --progress-bar off
-          cd ..
-          git clone git@github.com:keras-team/keras-core.git
-          pip install -r keras-core/requirements.txt --progress-bar off
-          python keras-core/pip_build.py --install
-          cd keras-nlp
+          pip install --no-deps -e "." --progress-bar off
     - name: Test with pytest
       env:
         KERAS_BACKEND: ${{ matrix.backend }}
@@ -127,6 +111,6 @@ jobs:
       - name: Install dependencies
         run: |
           pip install -r requirements.txt --progress-bar off
-          pip install -e "." --progress-bar off
+          pip install --no-deps -e "." --progress-bar off
       - name: Lint
         run: bash shell/lint.sh
diff --git a/requirements-common.txt b/requirements-common.txt
@@ -1,3 +1,7 @@
+keras-core
+# Consider handling GPU here.
+torch>=2.0.1+cpu
+jax[cpu]
 # Tooling.
 astor
 numpy~=1.23.2  # Numpy 1.24 breaks tests on ragged tensors
@@ -11,6 +15,7 @@ pytest-cov
 build
 namex
 regex
+rich
 # Optional deps.
 rouge-score
 sentencepiece
diff --git a/setup.py b/setup.py
@@ -51,10 +51,12 @@ def get_version(rel_path):
     author_email="keras-nlp@google.com",
     license="Apache License 2.0",
     install_requires=[
+        "keras-core",
         "absl-py",
         "numpy",
         "packaging",
         "regex",
+        "rich",
         # Don't require tensorflow-text on MacOS, there are no binaries for ARM.
         # Also, we rely on tensorflow *transitively* through tensorflow-text.
         # This avoid a slowdown during `pip install keras-nlp` where pip would