Skip to content

Commit

Permalink
Build updates
Browse files Browse the repository at this point in the history
  • Loading branch information
wch committed Nov 27, 2023
1 parent 642d786 commit 0aae729
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 20 deletions.
39 changes: 25 additions & 14 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -246,36 +246,47 @@ _shinylive:
# because I'm not sure how to set up the dependencies reliably.
## Build htmltools, shiny, and shinywidgets wheels
packages: clean-packages \
$(PACKAGE_DIR)/$(HTMLTOOLS_WHEEL) \
$(PACKAGE_DIR)/$(SHINY_WHEEL) \
$(PACKAGE_DIR)/$(SHINYWIDGETS_WHEEL) \
$(PACKAGE_DIR)/$(FAICONS_WHEEL) \
$(PACKAGE_DIR)/$(MIZANI_WHEEL) \
$(PACKAGE_DIR)/$(PLOTNINE_WHEEL) \
package-htmltools \
package-shiny \
package-shinywidgets \
package-faicons \
package-mizani \
package-plotnine


package-htmltools: $(PACKAGE_DIR)/$(HTMLTOOLS_WHEEL)

package-shiny: $(PACKAGE_DIR)/$(SHINY_WHEEL)

package-shinywidgets: $(PACKAGE_DIR)/$(SHINYWIDGETS_WHEEL)

package-faicons: $(PACKAGE_DIR)/$(FAICONS_WHEEL)

package-mizani: $(PACKAGE_DIR)/$(MIZANI_WHEEL)

package-plotnine: $(PACKAGE_DIR)/$(PLOTNINE_WHEEL)


$(PACKAGE_DIR)/$(HTMLTOOLS_WHEEL): $(PYBIN) $(PACKAGE_DIR)/py-htmltools
# Remove any old copies of the package
rm -f $(PACKAGE_DIR)/htmltools*.whl
. $(PYBIN)/activate && cd $(PACKAGE_DIR)/py-htmltools && make install-editable
. $(PYBIN)/activate && cd $(PACKAGE_DIR)/py-htmltools && make dist && mv dist/*.whl ../
$(PYBIN)/pip install -e $(PACKAGE_DIR)/py-htmltools[dev]
. $(PYBIN)/activate && cd $(PACKAGE_DIR)/py-htmltools && make install && mv dist/*.whl ../

$(PACKAGE_DIR)/$(SHINY_WHEEL): $(PYBIN) $(PACKAGE_DIR)/py-shiny
# Remove any old copies of the package
rm -f $(PACKAGE_DIR)/shiny*.whl
$(PYBIN)/pip install -e $(PACKAGE_DIR)/py-shiny[dev,test]
. $(PYBIN)/activate && cd $(PACKAGE_DIR)/py-shiny && make dist && mv dist/*.whl ../
. $(PYBIN)/activate && cd $(PACKAGE_DIR)/py-shiny && make install && mv dist/*.whl ../

$(PACKAGE_DIR)/$(SHINYWIDGETS_WHEEL): $(PYBIN) $(PACKAGE_DIR)/py-shinywidgets
# Remove any old copies of the package
rm -f $(PACKAGE_DIR)/shinywidgets*.whl
$(PYBIN)/pip install -e $(PACKAGE_DIR)/py-shinywidgets[dev,test]
. $(PYBIN)/activate && cd $(PACKAGE_DIR)/py-shinywidgets && make dist && mv dist/*.whl ../
. $(PYBIN)/activate && cd $(PACKAGE_DIR)/py-shinywidgets && make install && mv dist/*.whl ../

$(PACKAGE_DIR)/$(FAICONS_WHEEL): $(PYBIN) $(PACKAGE_DIR)/py-faicons
# Remove any old copies of the package
rm -f $(PACKAGE_DIR)/faicons*.whl
$(PYBIN)/pip install -e $(PACKAGE_DIR)/py-faicons[dev,test]
. $(PYBIN)/activate && cd $(PACKAGE_DIR)/py-faicons && make dist && mv dist/*.whl ../
. $(PYBIN)/activate && cd $(PACKAGE_DIR)/py-faicons && make install && mv dist/*.whl ../

$(PACKAGE_DIR)/$(MIZANI_WHEEL): $(PYBIN) $(PACKAGE_DIR)/mizani
rm -f $(PACKAGE_DIR)/mizani*.whl
Expand Down
2 changes: 1 addition & 1 deletion packages/py-shinywidgets
10 changes: 5 additions & 5 deletions shinylive_lock.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"htmltools": {
"name": "htmltools",
"version": "0.4.1.9000",
"filename": "htmltools-0.4.1.9000-py3-none-any.whl",
"version": "0.4.1.9001",
"filename": "htmltools-0.4.1.9001-py3-none-any.whl",
"sha256": null,
"url": null,
"depends": [
Expand All @@ -24,7 +24,7 @@
{"name": "uvicorn", "specs": [[">=", "0.16.0"]]},
{"name": "starlette", "specs": [[">=", "0.17.1"]]},
{"name": "python-multipart", "specs": []},
{"name": "htmltools", "specs": []},
{"name": "htmltools", "specs": [[">=", "0.4.1.9001"]]},
{"name": "click", "specs": [[">=", "8.1.4"]]},
{"name": "markdown-it-py", "specs": [[">=", "1.1.0"]]},
{"name": "mdit-py-plugins", "specs": [[">=", "0.3.0"]]},
Expand All @@ -38,8 +38,8 @@
},
"shinywidgets": {
"name": "shinywidgets",
"version": "0.2.2",
"filename": "shinywidgets-0.2.2-py3-none-any.whl",
"version": "0.2.4.9000",
"filename": "shinywidgets-0.2.4.9000-py3-none-any.whl",
"sha256": null,
"url": null,
"depends": [
Expand Down

0 comments on commit 0aae729

Please sign in to comment.