Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump node to current LTS & adapt build accordingly #149

Merged
merged 5 commits into from
Nov 9, 2023
Merged

bump node to current LTS & adapt build accordingly #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f670115
bump node to current LTS & adapt build accordingly
BastienGauthier Nov 9, 2023
8ac1747
control folium version
BastienGauthier Nov 9, 2023
100a39d
adapt test requirements
BastienGauthier Nov 9, 2023
28de54e
set node pip version same as the test one
BastienGauthier Nov 9, 2023
700d5e4
update setup.py
BastienGauthier Nov 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/publish_PYPI_each_tag.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: install node
uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20
# run: |
# sudo apt install nodejs npm
# npm --version
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run_tests_each_PR.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
python-version: ${{ matrix.python-version }}
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20
- name: build streamlit-folium JS
run: |
cd streamlit_folium/frontend/
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
streamlit>=1.13.0
folium>=0.13
folium>=0.13,<0.15
jinja2
branca
geopandas
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@
include_package_data=True,
classifiers=[],
python_requires=">=3.8",
install_requires=["streamlit>=1.13.0", "folium>=0.13", "jinja2", "branca"],
install_requires=["streamlit>=1.13.0", "folium>=0.13,<0.15", "jinja2", "branca"],
)
10 changes: 5 additions & 5 deletions streamlit_folium/frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "streamlit_folium",
"version": "0.3.1",
"version": "0.4.0",
"private": true,
"dependencies": {
"@testing-library/jest-dom": "^5.16.2",
Expand All @@ -16,9 +16,9 @@
"leaflet": "^1.7.1",
"leaflet-draw": "^1.0.2",
"leaflet.sync": "^0.2.4",
"react-scripts": "^4.0.0",
"streamlit-component-lib": "^1.3.0",
"typescript": "~3.8.0",
"react-scripts": "^5.0.1",
"streamlit-component-lib": "^2.0.0",
"typescript": "^4",
"underscore": "^1.13.2"
},
"scripts": {
Expand All @@ -44,7 +44,7 @@
},
"homepage": ".",
"devDependencies": {
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"@babel/plugin-transform-private-property-in-object": "^7.21.11",
"@types/leaflet-draw": "^1.0.5",
"@types/underscore": "^1.11.4"
}
Expand Down
4 changes: 2 additions & 2 deletions tests/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
streamlit>1.11.1
streamlit>=1.13.0
pytest>=7.1.2
folium>=0.13
folium>=0.13,<0.15
pytest-playwright
pytest-rerunfailures
geopandas
Loading