cvxgrp · kasperjo · Sep 14, 2023 · Sep 14, 2023 · Sep 14, 2023 · Sep 14, 2023
diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml
@@ -18,9 +18,3 @@ jobs:
 
     steps:
       - uses: cvxgrp/.github/actions/test@main
-
-      - name: Coveralls GitHub Action
-        uses: coverallsapp/github-action@v2
-        with:
-          files: artifacts/tests/coverage/coverage.info
-          format: lcov
diff --git a/.github/workflows/book.yml b/.github/workflows/book.yml
@@ -7,24 +7,14 @@ on:
 
 
 jobs:
-  sphinx:
-    runs-on: "ubuntu-latest"
-    steps:
-      - uses: cvxgrp/.github/actions/sphinx@main
-
-  test:
-    runs-on: "ubuntu-latest"
-    steps:
-      - uses: cvxgrp/.github/actions/test@main
-
   jupyter:
     runs-on: "ubuntu-latest"
     steps:
       - uses: cvxgrp/.github/actions/jupyter@main
 
   book:
     runs-on: "ubuntu-latest"
-    needs: [test, sphinx, jupyter]
+    needs: [jupyter]
 
     permissions:
       contents: write

diff --git a/Makefile b/Makefile
@@ -22,25 +22,11 @@ test: install ## Run tests
 clean:  ## Clean up caches and build artifacts
 	@git clean -X -d -f
 
-.PHONY: coverage
-coverage: install ## test and coverage
-	@poetry run coverage run --source=cvx/. -m pytest
-	@poetry run coverage report -m
-	@poetry run coverage html
-
-	@if [ ${UNAME} == "Darwin" ]; then \
-		open htmlcov/index.html; \
-	elif [ ${UNAME} == "linux" ]; then \
-		xdg-open htmlcov/index.html 2> /dev/null; \
-	fi
-
-
 .PHONY: help
 help:  ## Display this help screen
 	@echo -e "\033[1mAvailable commands:\033[0m"
 	@grep -E '^[a-z.A-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "  \033[36m%-18s\033[0m %s\n", $$1, $$2}' | sort
 
-
 .PHONY: jupyter
 jupyter: install ## Run jupyter lab
 	@poetry run pip install jupyterlab

diff --git a/book/_config.yml b/book/_config.yml
@@ -16,7 +16,7 @@ parse:
     - dollarmath
   myst_substitutions:
     book_url: https://www.cvxgrp.org/markowitz-reference
-    
+
 # needed for plotly
 sphinx:
   config:

diff --git a/book/_toc.yml b/book/_toc.yml
@@ -6,5 +6,3 @@ chapters:
     - file: docs/nb
       sections:
         - glob: docs/notebooks/*
-    - file: docs/api
-    - file: docs/reports
diff --git a/book/docs/api.md b/book/docs/api.md
diff --git a/book/docs/notebooks/demo.ipynb b/book/docs/notebooks/demo.ipynb
diff --git a/book/docs/reports.md b/book/docs/reports.md
diff --git a/book/sphinx/_static/custom.css b/book/sphinx/_static/custom.css
diff --git a/book/sphinx/_static/logo.jpeg b/book/sphinx/_static/logo.jpeg
diff --git a/book/sphinx/conf.py b/book/sphinx/conf.py
diff --git a/book/sphinx/index.rst b/book/sphinx/index.rst
diff --git a/book/sphinx/license.rst b/book/sphinx/license.rst
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,5 +1,5 @@
 [tool.poetry]
-name = "cvxsimulator"
+name = "markowitz-reference"
 version = "0.0.0"
 description = "Simple simulator for investors"
 authors = ["Thomas Schmelzer"]
@@ -14,16 +14,18 @@ pandas = "*"
 cvxpy = { git = "https://github.com/cvxpy/cvxpy", branch = "master" }
 
 [tool.poetry.group.test.dependencies]
-pytest = "*"
+pytest = "7.4.2"
 
 [build-system]
-requires = ["poetry>=1.6.0"]
+requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.ruff]
 select = ["E", "F", "I"]
 line-length = 120
 target-version = "py310"
 exclude = [
-    "*__init__.py"
+    "*__init__.py",
+    ".venv",
+    "experiments"
 ]
diff --git a/tests/test_builder.py b/tests/test_builder.py
@@ -1,5 +1,18 @@
 # """
 # testing the builder
 # """
+from cvx.markowitz.backtest import ParameterizedProblem
+
+
 def test_trivial(prices):
     assert prices.shape == (602, 7)
+
+
+def test_problem():
+    p = ParameterizedProblem(
+        problem="Markowitz",
+        variables=["x", "y"],
+        parameters="x + y",
+    )
+
+    assert p