Skip to content

Commit

Permalink
Merge branch 'feature/plugins' into tim/declare_component
Browse files Browse the repository at this point in the history
* feature/plugins:
  black reformatting
  Add "make mini-devel" to install minimal dev dependencies (i.e. doesn't install all the test dependencies) (streamlit#1407)
  Fixing date_input | min and max selectable date issues (streamlit#1426)
  Torch Tensorbase hash func (streamlit#1394)
  Change list() cast (streamlit#1401)
  Component template tweaks
  Components: alpha 2 cleanup (streamlit#1425)
  Fix dataframe support
  Add geo layers to DeckGlJsonChart (streamlit#1306)
  Clean up use of LoDash (streamlit#1404)
  Replace st.beta.*/st.experimental.* with st.beta_*/st.experimental_* (streamlit#1403)
  Release 0.59.0 (streamlit#1405)
  Setting textarea height and unit tests (streamlit#1411)
  • Loading branch information
tconkling committed May 11, 2020
2 parents 25b43c9 + 0c41b70 commit 953a14b
Show file tree
Hide file tree
Showing 148 changed files with 4,043 additions and 12,180 deletions.
29 changes: 23 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,17 @@ all-devel: init develop
@echo " make frontend"
@echo ""

.PHONY: mini-devel
# Get minimal dependencies and install Streamlit into Python environment -- but do not build the frontend.
mini-devel: mini-init develop

.PHONY: init
# Install Python and JS dependencies.
init: setup pipenv-install react-init scssvars protobuf # react-build release
# Install all Python and JS dependencies.
init: setup pipenv-install react-init scssvars protobuf

.PHONY: mini-init
# Install minimal Python and JS dependencies for development.
mini-init: setup pipenv-dev-install react-init scssvars protobuf

.PHONY: frontend
# Build frontend into static files.
Expand All @@ -41,14 +49,23 @@ frontend: react-build
.PHONY: setup
setup:
pip install pip-tools pipenv ; \
if [[ $(PY_VERSION) == "3.6.0" || $(PY_VERSION) > "3.6.0" ]] ; then \
pip install black ; \
if [[ $(PY_VERSION) == "3.6.0" || $(PY_VERSION) > "3.6.0" ]]; then \
pip install black; \
fi

.PHONY: pipenv-install
pipenv-install: lib/Pipfile
pipenv-install: pipenv-dev-install pipenv-test-install

.PHONY: pipenv-dev-install
pipenv-dev-install: lib/Pipfile
@# Runs pipenv install; doesn't update the Pipfile.lock.
cd lib; pipenv install --dev --skip-lock
cd lib; \
pipenv install --dev --skip-lock

.PHONY: pipenv-test-install
pipenv-test-install: lib/test-requirements.txt
cd lib; \
pip install -r test-requirements.txt

.PHONY: pylint
# Run "black", our Python formatter, to verify that our source files
Expand Down
55 changes: 0 additions & 55 deletions component_template/src/MyComponent.tsx

This file was deleted.

11 changes: 0 additions & 11 deletions component_template/src/examples/BuggyComponent.tsx

This file was deleted.

42 changes: 0 additions & 42 deletions component_template/src/examples/Resizer.tsx

This file was deleted.

3 changes: 0 additions & 3 deletions component_template/src/index.tsx

This file was deleted.

56 changes: 0 additions & 56 deletions component_template/src/streamlit/StreamlitComponent.tsx

This file was deleted.

Loading

0 comments on commit 953a14b

Please sign in to comment.