Release 11/11/24 (#131)

- Setup PIP - Remove Prefect from repo - Remove any leftover references of participation rewards --------- Co-authored-by: Haris Angelidakis <[email protected]>
cowprotocol · Nov 11, 2024 · 748478c · 748478c
1 parent 92e702d
commit 748478c
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 282 deletions.
diff --git a/.github/workflows/prefect.yaml b/.github/workflows/prefect.yaml
diff --git a/Makefile b/Makefile
@@ -48,22 +48,3 @@ build-image:
 run-image:
 	echo "using ${PWD}/data"
 	docker run -v ${PWD}/data:/app/data --env-file .env local_dune_sync
-
-prefect:
-	@if [ -z "$(VIRTUAL_ENV)" ]; then \
-		echo "Error: Not in a virtual environment. Please activate a virtual environment before running this command."; \
-		exit 1; \
-	else \
-		pip install -r requirements/prefect.txt; \
-		prefect server start; \
-	fi
-
-deployment:
-	@if [ -z "$(VIRTUAL_ENV)" ]; then \
-		echo "Error: Not in a virtual environment. Please activate a virtual environment before running this command."; \
-		exit 1; \
-	else \
-		pip install -r requirements/prefect.txt; \
-		pip install -r requirements/prod.txt; \
-		python -m src.deploy_prefect.local_deploy; \
-	fi
diff --git a/README.md b/README.md
@@ -15,6 +15,12 @@ To execute the main binary (inside the container) run
 python3 -m src.main --sync-table <job>
 ```
 
+Another way to install the repo is with pip:
+``
+pip install git+https://github.com/cowprotocol/dune-sync.git@<branch-name>
+```
+This allows you to install the repo as a module to your local environment and automatically install the required dependencies.
+
 # Docker
 
 ### Build

diff --git a/manifest.in b/manifest.in
@@ -0,0 +1,2 @@
+include logging.conf
+include requirements/prod.txt
diff --git a/requirements/prefect.txt b/requirements/prefect.txt
diff --git a/setup.py b/setup.py
@@ -0,0 +1,28 @@
+import os
+from setuptools import setup, find_packages
+
+subpackages = find_packages("src")
+packages = ["src"] + ["src." + p for p in subpackages]
+
+
+def read_requirements(filename):
+    with open(filename, "r") as f:
+        return [line.strip() for line in f.readlines() if line.strip()]
+
+
+setup(
+    name="src",
+    version="1.6.4",
+    packages=packages,
+    package_dir={"dune_sync": "src/dune_sync"},
+    include_package_data=True,
+    data_files=[
+        (
+            os.path.join(
+                "lib", "python{0}.{1}".format(*os.sys.version_info[:2]), "site-packages"
+            ),
+            ["logging.conf"],
+        )
+    ],
+    install_requires=read_requirements("requirements/prod.txt"),
+)
diff --git a/src/deploy_prefect/__init__.py b/src/deploy_prefect/__init__.py
diff --git a/src/deploy_prefect/deployment.py b/src/deploy_prefect/deployment.py
diff --git a/src/deploy_prefect/local_deploy.py b/src/deploy_prefect/local_deploy.py
diff --git a/src/models/batch_rewards_schema.py b/src/models/batch_rewards_schema.py
@@ -35,7 +35,6 @@ def from_pdf_to_dune_records(cls, rewards_df: DataFrame) -> list[dict[str, Any]]
                     "fee": int(row["network_fee"]),
                     "winning_score": int(row["winning_score"]),
                     "reference_score": int(row["reference_score"]),
-                    "participating_solvers": row["participating_solvers"],
                 },
             }
             for row in rewards_df.to_dict(orient="records")

diff --git a/tests/unit/test_batch_rewards_schema.py b/tests/unit/test_batch_rewards_schema.py
@@ -34,21 +34,6 @@ def test_order_rewards_transformation(self):
                 "capped_payment": [-1000000000000000, -1000000000000000],
                 "winning_score": [123456 * ONE_ETH, 6789 * ONE_ETH],
                 "reference_score": [ONE_ETH, 2 * ONE_ETH],
-                "participating_solvers": [
-                    [
-                        "0x51",
-                        "0x52",
-                        "0x53",
-                    ],
-                    [
-                        "0x51",
-                        "0x52",
-                        "0x53",
-                        "0x54",
-                        "0x55",
-                        "0x56",
-                    ],
-                ],
             }
         )
 
@@ -61,7 +46,6 @@ def test_order_rewards_transformation(self):
                         "capped_payment": -1000000000000000,
                         "execution_cost": 9999000000000000000000,
                         "fee": 1000000000000000,
-                        "participating_solvers": ["0x51", "0x52", "0x53"],
                         "protocol_fee": 2000000000000000,
                         "reference_score": 1000000000000000000,
                         "surplus": 2000000000000000000,
@@ -78,14 +62,6 @@ def test_order_rewards_transformation(self):
                         "capped_payment": -1000000000000000,
                         "execution_cost": 1,
                         "fee": max_uint,
-                        "participating_solvers": [
-                            "0x51",
-                            "0x52",
-                            "0x53",
-                            "0x54",
-                            "0x55",
-                            "0x56",
-                        ],
                         "protocol_fee": 0,
                         "reference_score": 2000000000000000000,
                         "surplus": 3000000000000000000,
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		include logging.conf
		include requirements/prod.txt