Skip to content

Commit

Permalink
Upgrade to ipyleaflet==0.19.1, ipwidgets==8.1.3, jupyterlite~=0.3.0
Browse files Browse the repository at this point in the history
Add Python 3.12 support+testing (remove testing on 3.8)

Signed-off-by: Emmanuel Decitre <[email protected]>
  • Loading branch information
decitre committed Jul 5, 2024
1 parent 38c057f commit 08dd40b
Show file tree
Hide file tree
Showing 12 changed files with 294 additions and 662 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: ["3.8", "3.9", "3.10", "3.11"]
python-version: ["3.9", "3.10", "3.11", "3.12"]
steps:
- uses: actions/checkout@v3

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Link the virtual environment to a IPython kernel:
Use the `here-search-notebooks` script with your HERE API Key:

```
API_KEY="your API key" here-search-notebooks
API_KEY="your API key" python -m jupyterlab src/here_search/demo/notebooks
```

(Additional [notes][2])
Expand Down
8 changes: 7 additions & 1 deletion docs/developers.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,12 @@ To update the package version, use `bumpver`. For instance:
(...)
```

Push your change through a branch PR.
Then on your local main branch, after a rebase from origin, do a `bumpver update --patch`.
Finally, "Draft a new release" and choose the new tag you just created with `bumpver`.
The creation of a new release should trigger the release to pypi workflow.


### Test on MacOS / python3.7

1. Build Python 3.7.9 for `pyenv`
Expand Down Expand Up @@ -109,7 +115,7 @@ To test the JupyterLite page locally, run in a virtualenv :
tar xpfz $(find . -name "*.tar.gz")
$(find . -name "lite-run.sh")
$(find src -name "lite-run.sh")
```

#### Clear your browser cache
Expand Down
61 changes: 58 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,67 @@
# Copyright (C) 2019-2024 HERE Global B.V. and its affiliate(s).
# All rights reserved.
#
# This software and other materials contain proprietary information
# controlled by HERE and are protected by applicable copyright legislation.
# Any use and utilization of this software and other materials and
# disclosure to any third parties is conditional upon having a separate
# agreement with HERE for the access, use, utilization or disclosure of this
# software. In the absence of such agreement, the use of the software is not
# allowed.

[build-system]
requires = [
"setuptools>=42",
"wheel"
]
build-backend = "setuptools.build_meta"

[project]
name = "here-search-demo"
version = "0.9.1"
description = "HERE Geocoding and Search demo and widgets"
readme = "README.md"
authors = [ {name = "HERE Global B.V. and its affiliate(s)", email = "[email protected]"} ]
license = {text = "The MIT License"}
requires-python = ">=3.8"
classifiers = [
"Development Status :: 4 - Beta",
"Intended Audience :: Developers",
"Natural Language :: English",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: Implementation :: CPython",
"Programming Language :: Python :: Implementation :: PyPy",
"Topic :: Scientific/Engineering :: GIS",
"Topic :: Software Development :: Libraries",
"Topic :: Software Development :: Libraries :: Python Modules",
]
dynamic = ["dependencies"]

[tool.setuptools.dynamic]
dependencies = {file = ["requirements/build.txt"]}

[project.urls]
homepage = "https://here.com"
repository = "ssh://[email protected]:heremaps/here-search-demo.git"

[project.optional-dependencies]
lab = [
"aiohttp",
"xyzservices"
]

[tool.setuptools]
include-package-data = true

[tool.setuptools.packages.find]
where = ["src"]

[tool.bumpver]
current_version = "0.9.1"
version_pattern = "MAJOR.MINOR.PATCH"
Expand All @@ -15,11 +72,9 @@ push = true

[tool.bumpver.file_patterns]
"pyproject.toml" = [
'version = "{version}"',
'current_version = "{version}"',
]
"src/here_search/demo/__init__.py" = [
'^__version__ = "{version}"$'
]
"src/here_search/demo/notebooks/*.ipynb" = [
'here_search_demo-{version}-py3-none-any.whl'
]
Expand Down
17 changes: 9 additions & 8 deletions requirements/build.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
jupyterlab>=3.5.2,<4
jupyterlab_widgets>=1.1.1
jupyterlab-filesystem-access>=0.5.3
jupyterlite~=0.1.2
ipywidgets>=8,<9
ipyleaflet==0.17.3
jupyterlite-core==0.1.2
jupyterlite-pyodide-kernel==0.1.1
ipyleaflet==0.19.1
ipywidgets==8.1.3
jupyterlab
jupyterlab_widgets
jupyterlab-filesystem-access
jupyterlite~=0.3.0
jupyterlite-core
jupyterlite-pyodide-kernel
jupyterlite-javascript-kernel
libarchive-c
4 changes: 1 addition & 3 deletions requirements/util.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
wheel
build
bumpver
twine
pur
49 changes: 0 additions & 49 deletions setup.cfg

This file was deleted.

Loading

0 comments on commit 08dd40b

Please sign in to comment.