resolve conflicts

oist · May 8, 2023 · c56784b · c56784b
2 parents c617766 + 40bd530
commit c56784b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/Makefile b/Makefile
@@ -46,6 +46,8 @@ local_build:
 
 .PHONY: upload_testpypi
 upload_testpypi:
+	mkdir -p optinist/frontend/build
+	cp -r frontend/build optinist/frontend/
 	python setup.py sdist
 	twine upload --repository testpypi dist/*
 

diff --git a/setup.py b/setup.py
@@ -55,6 +55,7 @@ def take_package_name(name):
             "frontend/build/static/media/*",
             "config/*.yaml",
             "conda/*.yaml",
+            "Snakefile",
         ]
     },
     py_modules=["Snakefile"],