From a986b1d47e764af7c1807c7af0be65ff8bfb0ecd Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 11 Nov 2021 21:40:11 +0100 Subject: [PATCH] JupyterLab 3, Debian Bullseye, Python 3.9 (#302) --- .github/labels.yml | 85 ----------------------------------- .github/release-drafter.yml | 57 ----------------------- jupyterlab/Dockerfile | 90 +++++++++++++++++-------------------- jupyterlab/build.yaml | 4 +- jupyterlab/requirements.txt | 32 ++++++------- 5 files changed, 59 insertions(+), 209 deletions(-) delete mode 100644 .github/labels.yml delete mode 100644 .github/release-drafter.yml diff --git a/.github/labels.yml b/.github/labels.yml deleted file mode 100644 index 2d0f68ad..00000000 --- a/.github/labels.yml +++ /dev/null @@ -1,85 +0,0 @@ ---- -- name: "breaking-change" - color: ee0701 - description: "A breaking change for existing users." -- name: "bugfix" - color: ee0701 - description: "Inconsistencies or issues which will cause a problem for users or implementors." -- name: "documentation" - color: 0052cc - description: "Solely about the documentation of the project." -- name: "enhancement" - color: 1d76db - description: "Enhancement of the code, not introducing new features." -- name: "refactor" - color: 1d76db - description: "Improvement of existing code, not introducing new features." -- name: "performance" - color: 1d76db - description: "Improving performance, not introducing new features." -- name: "new-feature" - color: 0e8a16 - description: "New features or options." -- name: "maintenance" - color: 2af79e - description: "Generic maintenance tasks." -- name: "ci" - color: 1d76db - description: "Work that improves the continue integration." -- name: "dependencies" - color: 1d76db - description: "Upgrade or downgrade of project dependencies." - -- name: "in-progress" - color: fbca04 - description: "Issue is currently being resolved by a developer." -- name: "stale" - color: fef2c0 - description: "There has not been activity on this issue or PR for quite some time." -- name: "no-stale" - color: fef2c0 - description: "This issue or PR is exempted from the stable bot." - -- name: "security" - color: ee0701 - description: "Marks a security issue that needs to be resolved asap." -- name: "incomplete" - color: fef2c0 - description: "Marks a PR or issue that is missing information." -- name: "invalid" - color: fef2c0 - description: "Marks a PR or issue that is missing information." - -- name: "beginner-friendly" - color: 0e8a16 - description: "Good first issue for people wanting to contribute to the project." -- name: "help-wanted" - color: 0e8a16 - description: "We need some extra helping hands or expertise in order to resolve this." - -- name: "hacktoberfest" - description: "Issues/PRs are participating in the Hacktoberfest." - color: fbca04 -- name: "hacktoberfest-accepted" - description: "Issues/PRs are participating in the Hacktoberfest." - color: fbca04 - -- name: "priority-critical" - color: ee0701 - description: "This should be dealt with ASAP. Not fixing this issue would be a serious error." -- name: "priority-high" - color: b60205 - description: "After critical issues are fixed, these should be dealt with before any further issues." -- name: "priority-medium" - color: 0e8a16 - description: "This issue may be useful, and needs some attention." -- name: "priority-low" - color: e4ea8a - description: "Nice addition, maybe... someday..." - -- name: "major" - color: b60205 - description: "This PR causes a major version bump in the version number." -- name: "minor" - color: 0e8a16 - description: "This PR causes a minor version bump in the version number." diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml deleted file mode 100644 index cb404ea3..00000000 --- a/.github/release-drafter.yml +++ /dev/null @@ -1,57 +0,0 @@ ---- -name-template: "v$RESOLVED_VERSION" -tag-template: "v$RESOLVED_VERSION" -change-template: "- $TITLE @$AUTHOR (#$NUMBER)" -sort-direction: ascending - -categories: - - title: "🚨 Breaking changes" - labels: - - "breaking-change" - - title: "✨ New features" - labels: - - "new-feature" - - title: "πŸ› Bug fixes" - labels: - - "bugfix" - - title: "πŸš€ Enhancements" - labels: - - "enhancement" - - "refactor" - - "performance" - - title: "🧰 Maintenance" - labels: - - "maintenance" - - "ci" - - title: "πŸ“š Documentation" - labels: - - "documentation" - - title: "⬆️ Dependency updates" - labels: - - "dependencies" - -version-resolver: - major: - labels: - - "major" - - "breaking-change" - minor: - labels: - - "minor" - - "new-feature" - patch: - labels: - - "bugfix" - - "chore" - - "ci" - - "dependencies" - - "documentation" - - "enhancement" - - "performance" - - "refactor" - default: patch - -template: | - ## What’s changed - - $CHANGES diff --git a/jupyterlab/Dockerfile b/jupyterlab/Dockerfile index 8ba3c63c..a19de99e 100644 --- a/jupyterlab/Dockerfile +++ b/jupyterlab/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:4.1.2 +ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:5.2.2 # hadolint ignore=DL3006 FROM ${BUILD_FROM} @@ -18,61 +18,53 @@ RUN \ \ && apt-get update \ && apt-get install -y --no-install-recommends \ - build-essential=12.6 \ - dirmngr=2.2.12-1+deb10u1 \ - git=1:2.20.1-2+deb10u3 \ - gpg-agent=2.2.12-1+deb10u1 \ - gpg=2.2.12-1+deb10u1 \ - libffi-dev=3.2.1-9 \ - libffi6=3.2.1-9 \ - libfreetype6-dev=2.9.1-3+deb10u2 \ - libfreetype6=2.9.1-3+deb10u2 \ - libjpeg62-turbo-dev=1:1.5.2-2+deb10u1 \ - libjpeg62-turbo=1:1.5.2-2+deb10u1 \ - libmariadb-dev=1:10.3.25-0+deb10u1 \ - libmariadb3=1:10.3.25-0+deb10u1 \ - libnginx-mod-http-lua=1.14.2-2+deb10u3 \ - libpng-dev=1.6.36-6 \ - libpng16-16=1.6.36-6 \ - libpq-dev=11.11-0+deb10u1 \ - libpq5=11.11-0+deb10u1 \ - libssl-dev=1.1.1d-0+deb10u6 \ - libtiff5-dev=4.1.0+git191117-2~deb10u2 \ - libxml2-dev=2.9.4+dfsg1-7+deb10u1 \ - libxml2=2.9.4+dfsg1-7+deb10u1 \ - libxslt1-dev=1.1.32-2.2~deb10u1 \ - libxslt1.1=1.1.32-2.2~deb10u1 \ - libzmq3-dev=4.3.1-4+deb10u2 \ - libzmq5=4.3.1-4+deb10u2 \ - nginx=1.14.2-2+deb10u3 \ - pandoc>=2.2.1-3 \ - pkg-config=0.29-6 \ - python-dev=2.7.16-1 \ - python3-dev=3.7.3-1 \ - python3-distutils=3.7.3-1 \ - python3-minimal=3.7.3-1 \ - zlib1g-dev=1:1.2.11.dfsg-1 \ + build-essential=12.9 \ + dirmngr=2.2.27-2 \ + git=1:2.30.2-1 \ + gpg-agent=2.2.27-2 \ + gpg=2.2.27-2 \ + libffi-dev=3.3-6 \ + libffi7=3.3-6 \ + libfreetype6-dev=2.10.4+dfsg-1 \ + libfreetype6=2.10.4+dfsg-1 \ + libjpeg62-turbo-dev=1:2.0.6-4 \ + libjpeg62-turbo=1:2.0.6-4 \ + libmariadb-dev=1:10.5.12-0+deb11u1 \ + libmariadb3=1:10.5.12-0+deb11u1 \ + libnginx-mod-http-lua=1.18.0-6.1 \ + libpng-dev=1.6.37-3 \ + libpng16-16=1.6.37-3 \ + libpq-dev=13.4-0+deb11u1 \ + libpq5=13.4-0+deb11u1 \ + libssl-dev=1.1.1k-1+deb11u1 \ + libtiff5-dev=4.2.0-1 \ + libxml2-dev=2.9.10+dfsg-6.7 \ + libxml2=2.9.10+dfsg-6.7 \ + libxslt1-dev=1.1.34-4 \ + libxslt1.1=1.1.34-4 \ + libzmq3-dev=4.3.4-1 \ + libzmq5=4.3.4-1 \ + nginx=1.18.0-6.1 \ + pandoc=2.9.2.1-1+b1 \ + pkg-config=0.29.2-1 \ + python3-dev=3.9.2-3 \ + python3-distutils=3.9.2-1 \ + python3-minimal=3.9.2-3 \ + zlib1g-dev=1:1.2.11.dfsg-2 \ \ - && curl -sL https://deb.nodesource.com/setup_12.x | bash - \ + && curl -sL https://deb.nodesource.com/setup_14.x | bash - \ \ && apt-get install -y --no-install-recommends \ - nodejs=12.22.0-1nodesource1 \ + nodejs=14.18.1-deb-1nodesource1 \ \ && curl https://bootstrap.pypa.io/get-pip.py | python3 \ \ && update-alternatives \ --install /usr/bin/python python /usr/bin/python3 10 \ \ - && pip3 install --no-cache-dir numpy==1.20.2 \ + && pip3 install --no-cache-dir numpy==1.21.4 \ && pip3 install --no-cache-dir -r /opt/requirements.txt \ \ - && jupyter labextension install \ - @jupyter-widgets/jupyterlab-manager@2.0.0 --no-build \ - && jupyter labextension install @bokeh/jupyter_bokeh --no-build \ - && jupyter labextension install @jupyterlab/github --no-build \ - && jupyter serverextension enable jupyterlab_sql --py --sys-prefix \ - && jupyter lab build \ - \ && apt-get purge -y --auto-remove \ build-essential \ dirmngr \ @@ -94,10 +86,10 @@ RUN \ python3-dev \ zlib1g-dev \ \ - && find /usr/local/lib/python3.7/ -type d -name tests -depth -exec rm -rf {} \; \ - && find /usr/local/lib/python3.7/ -type d -name test -depth -exec rm -rf {} \; \ - && find /usr/local/lib/python3.7/ -name __pycache__ -depth -exec rm -rf {} \; \ - && find /usr/local/lib/python3.7/ -name "*.pyc" -depth -exec rm -f {} \; \ + && find /usr/local \ + \( -type d -a -name test -o -name tests -o -name '__pycache__' \) \ + -o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \ + -exec rm -rf '{}' + \ \ && npm cache clean --force \ \ diff --git a/jupyterlab/build.yaml b/jupyterlab/build.yaml index 342fd9b9..39bf0932 100644 --- a/jupyterlab/build.yaml +++ b/jupyterlab/build.yaml @@ -1,4 +1,4 @@ --- build_from: - aarch64: ghcr.io/hassio-addons/debian-base/aarch64:4.1.2 - amd64: ghcr.io/hassio-addons/debian-base/amd64:4.1.2 + aarch64: ghcr.io/hassio-addons/debian-base/aarch64:5.2.2 + amd64: ghcr.io/hassio-addons/debian-base/amd64:5.2.2 diff --git a/jupyterlab/requirements.txt b/jupyterlab/requirements.txt index 4a047175..317aaea4 100644 --- a/jupyterlab/requirements.txt +++ b/jupyterlab/requirements.txt @@ -1,20 +1,20 @@ -beautifulsoup4==4.9.3 -bokeh==2.2.3 -geopy==2.1.0 +beautifulsoup4==4.10.0 +bokeh==2.4.1 +geopy==2.2.0 HASS-data-detective==2.4 influxdb==5.3.1 -ipywidgets==7.6.3 -jupyterlab_github==2.0.0 -jupyterlab_sql==0.3.3 -jupyterlab==2.2.10 -matplotlib==3.3.3 +ipywidgets==7.6.5 +jupyter_bokeh==3.0.4 +jupyterlab_widgets==1.0.2 +jupyterlab==3.2.3 +matplotlib==3.4.3 mysqlclient==2.0.3 -nbconvert==6.0.7 -numpy==1.20.0 -pandas-datareader==0.9.0 -pandas==1.2.1 -psycopg2==2.8.6 -python-dateutil==2.8.1 +nbconvert==6.2.0 +numpy==1.21.4 +pandas-datareader==0.10.0 +pandas==1.3.4 +psycopg2==2.9.1 +python-dateutil==2.8.2 scrapy==2.5.1 -seaborn==0.11.1 -SQLAlchemy==1.3.23 +seaborn==0.11.2 +SQLAlchemy==1.4.26 \ No newline at end of file