initial commit

delvtech · Mar 5, 2024 · 6306280 · 6306280
1 parent c0bbc32
commit 6306280
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 70 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -3,8 +3,8 @@ name: "Docker: Build and push agent0 image"
 on:
   workflow_dispatch:
   push:
-    branches: ["main"]
-    tags: ["*"]
+    branches:
+      - uv-installable
 
 env:
   REGISTRY: ghcr.io

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -3,7 +3,7 @@ name: lint
 on:
   push:
     branches:
-      - main
+      - uv-installable
   pull_request:
 
 jobs:
@@ -22,14 +22,14 @@ jobs:
           cache: "pip"
           token: ${{github.token}}
 
-      - name: upgrade pip
-        run: python -m pip install --upgrade pip
+      - name: install uv
+        run: curl -LsSf https://astral.sh/uv/install.sh | sh
 
       - name: install requirements
         run: |
-          python -m pip install --upgrade -r requirements.txt
-          python -m pip install --upgrade -r requirements-rl.txt
-          python -m pip install --upgrade -r requirements-dev.txt
+          uv pip install --upgrade -r requirements.txt
+          uv pip install --upgrade -r requirements-rl.txt
+          uv pip install --upgrade -r requirements-dev.txt
 
       - name: run black
         run: python -m black --config pyproject.toml --check --diff .

diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -3,7 +3,7 @@ name: static
 on:
   push:
     branches:
-      - main
+      - uv-installable
   pull_request:
 
 jobs:
@@ -22,14 +22,14 @@ jobs:
           cache: "pip"
           token: ${{github.token}}
 
-      - name: upgrade pip
-        run: python -m pip install --upgrade pip
+      - name: install uv
+        run: curl -LsSf https://astral.sh/uv/install.sh | sh
 
       - name: install requirements
         run: |
-          python -m pip install --upgrade -r requirements.txt
-          python -m pip install --upgrade -r requirements-rl.txt
-          python -m pip install --upgrade -r requirements-dev.txt
+          uv pip install --upgrade -r requirements.txt
+          uv pip install --upgrade -r requirements-rl.txt
+          uv pip install --upgrade -r requirements-dev.txt
 
       - name: analysing code with pyright
         run: python -m pyright $(git ls-files '*.py' '*.pyi')
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -3,7 +3,7 @@ name: test
 on:
   push:
     branches:
-      - main
+      - uv-installable
   pull_request:
 
 jobs:
@@ -41,14 +41,14 @@ jobs:
           cache: "pip"
           token: ${{github.token}}
 
-      - name: upgrade pip
-        run: python -m pip install --upgrade pip
+      - name: install uv
+        run: curl -LsSf https://astral.sh/uv/install.sh | sh
 
       - name: install requirements
         run: |
-          python -m pip install --upgrade -r requirements.txt
-          python -m pip install --upgrade -r requirements-rl.txt
-          python -m pip install --upgrade -r requirements-dev.txt
+          uv pip install --upgrade -r requirements.txt
+          uv pip install --upgrade -r requirements-rl.txt
+          uv pip install --upgrade -r requirements-dev.txt
 
       - name: run pytest with coverage
         run: |

diff --git a/lib/agent0/pyproject.toml b/lib/agent0/pyproject.toml
@@ -15,29 +15,17 @@ classifiers = [
     "License :: OSI Approved :: Apache Software License",
     "Operating System :: OS Independent",
 ]
-
-[project.optional-dependencies]
-# This flag installs all dependencies and should be ran when installing this subpackage in isolation
-with-dependencies = ["agent0[base, lateral]"]
-base = [
-    "fixedpointmath",
+dependencies = [
     "numpy",
     "python-dotenv",
-    # will include eth- packages
     "web3",
     "hexbytes",
     "pandas",
     "nest_asyncio",
     "rollbar",
     "dill",
+    "fixedpointmath @ git+https://github.com/delvtech/fixedpointmath.git",
 ]
-lateral = [
-    # Lateral dependencies across subpackages are pointing to github
-    "hyperlogs[with-dependencies] @ git+https://github.com/delvtech/agent0.git/#subdirectory=lib/hyperlogs",
-    "ethpy[with-dependencies] @ git+https://github.com/delvtech/agent0.git/#subdirectory=lib/ethpy",
-    "chainsync[with-dependencies] @ git+https://github.com/delvtech/agent0.git/#subdirectory=lib/chainsync",
-]
-
 
 [build-system]
 requires = ["flit_core>=3.2"]

diff --git a/lib/chainsync/pyproject.toml b/lib/chainsync/pyproject.toml
@@ -15,13 +15,7 @@ classifiers = [
     "License :: OSI Approved :: Apache Software License",
     "Operating System :: OS Independent",
 ]
-
-[project.optional-dependencies]
-# This flag installs all dependencies and should be ran when installing this subpackage in isolation
-with-dependencies = [
-    "chainsync[base, lateral]"
-]
-base = [
+dependencies = [
     "fixedpointmath",
     "matplotlib",
     "numpy",
@@ -37,11 +31,6 @@ base = [
     "pandas-stubs",
     "requests",
 ]
-lateral = [
-    # Lateral dependencies across subpackages are pointing to github
-    "hyperlogs[with-dependencies] @ git+https://github.com/delvtech/agent0.git/#subdirectory=lib/hyperlogs",
-    "ethpy[with-dependencies] @ git+https://github.com/delvtech/agent0.git/#subdirectory=lib/ethpy",
-]
 
 [build-system]
 requires = ["flit_core>=3.2"]

diff --git a/lib/ethpy/pyproject.toml b/lib/ethpy/pyproject.toml
@@ -15,22 +15,12 @@ classifiers = [
     "License :: OSI Approved :: Apache License 2.0",
     "Operating System :: OS Independent",
 ]
-
-[project.optional-dependencies]
-# This flag installs all dependencies and should be run when installing this subpackage in isolation
-with-dependencies = [
-    "ethpy[base, lateral]"
-]
-base = [
+dependencies = [
     "fixedpointmath",
     "numpy",
     "python-dotenv",
     "web3",
 ]
-lateral = [
-    # Lateral dependencies across subpackages are pointing to github
-    "hypertypes[with-dependencies] @ git+https://github.com/delvtech/agent0.git/#subdirectory=lib/hypertypes",
-]
 
 [project.urls]
 "Homepage" = "https://github.com/delvtech/agent0"

diff --git a/lib/hyperlogs/pyproject.toml b/lib/hyperlogs/pyproject.toml
@@ -16,14 +16,6 @@ classifiers = [
     "Operating System :: OS Independent",
 ]
 
-[project.optional-dependencies]
-# This flag installs all dependencies and should be ran when installing this subpackage in isolation
-with-dependencies = [
-    "hyperlogs[base, lateral]"
-]
-base = []
-lateral = []
-
 [build-system]
 requires = ["flit_core>=3.2"]
 build-backend = "flit_core.buildapi"
diff --git a/lib/hypertypes/pyproject.toml b/lib/hypertypes/pyproject.toml
@@ -10,10 +10,10 @@ classifiers = [
     "License :: OSI Approved :: Apache License 2.0",
     "Operating System :: OS Independent",
 ]
-
-[project.optional-dependencies]
-with-dependencies = ["hypertypes[base]"]
-base = ["web3", "pypechain"]
+dependencies = [
+    "web3",
+    "pypechain",
+]
 
 [build-system]
 requires = ["flit_core>=3.2"]

diff --git a/requirements.txt b/requirements.txt
@@ -3,6 +3,6 @@
 -e lib/chainsync[base]
 -e lib/ethpy[base]
 -e lib/hypertypes[base]
---find-links="packages/hyperdrivepy"
+--find-links=packages/hyperdrivepy
 hyperdrivepy
 rollbar