Merge pull request #2397 from slaff/release/4.4.1

Release: 4.4.1
SmingHub · Oct 20, 2021 · 4523db2 · 4523db2
2 parents 910eb17 + d2a2a49
commit 4523db2
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 16 deletions.
diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -8,11 +8,13 @@ version: 2
 # Optionally build your docs in additional formats such as PDF and ePub
 formats:
   - htmlzip
-#  - pdf
+
+sphinx:
+  configuration: docs/source/conf.py
 
 # Optionally set the version of Python and requirements required to build your docs
 python:
-  version: 3.7
+  version: 3.8
   install:
     - requirements: docs/requirements.txt
 

diff --git a/README.md b/README.md
@@ -117,7 +117,7 @@ Supported SDK: ESP-IDF v4.3. See https://sming.readthedocs.io/en/latest/_inc/Smi
 
 ### Stable
 
-- [Sming V4.4.0](https://github.com/SmingHub/Sming/releases/tag/4.4.0) - great new features, performance and stability improvements.
+- [Sming V4.4.1](https://github.com/SmingHub/Sming/releases/tag/4.4.1) - great new features, performance and stability improvements.
 
 
 ### Long Term Support (LTS)

diff --git a/Sming/Arch/Esp32/Components/esp32/component.mk b/Sming/Arch/Esp32/Components/esp32/component.mk
@@ -117,7 +117,6 @@ SDK_COMPONENTS += \
 	esp_wifi \
 	esp_eth \
 	lwip \
-	mbedtls \
 	mbedcrypto \
 	esp_netif \
 	openssl

diff --git a/Sming/Arch/Esp32/Components/esp32/sdk/config/common b/Sming/Arch/Esp32/Components/esp32/sdk/config/common
@@ -37,5 +37,8 @@ CONFIG_VFS_SUPPORT_DIR=n
 CONFIG_VFS_SUPPORT_SELECT=n
 CONFIG_VFS_SUPPORT_TERMIOS=n
 
+# Not used
+CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=n
+
 # Debugging
 CONFIG_ESP_SYSTEM_PANIC_GDBSTUB=y
diff --git a/Sming/Core/SmingVersion.h b/Sming/Core/SmingVersion.h
@@ -7,7 +7,7 @@
 
 #define SMING_MAJOR_VERSION 4
 #define SMING_MINOR_VERSION 4
-#define SMING_PATCH_VERSION 0
+#define SMING_PATCH_VERSION 1
 #define SMING_PRE_RELEASE ""
 
 #define MACROQUOT(x) #x

diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -1,11 +1,12 @@
 # Requirements file for pip
 # list of Python packages used in documentation build
-sphinx==2.4.4
-sphinx-rtd-theme
-m2r
-breathe==4.13.0
+sphinx==4.2.0
+sphinx-rtd-theme==1.0.0
+m2r2
+breathe==4.31.0
 sphinxcontrib-wavedrom
 sphinx-copybutton
-sphinxcontrib-seqdiag>=0.8.5
-jinja2>=2.11.3
-setuptools==57.5.0
+sphinxcontrib-seqdiag==2.0.0
+jinja2==2.11.3
+setuptools>=57.5.0
+funcparserlib==1.0.0a0
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -45,7 +45,7 @@
 # so developers can more easily locate the appropriate reference documentation.
 #
 extensions = [
-    'm2r',
+    'm2r2',
     'breathe',
     'sphinxcontrib.seqdiag',
     'link-roles',
@@ -101,6 +101,10 @@
 # so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ['_static']
 
+html_css_files = [
+    'custom.css',
+]
+
 html_extra_path = [
     '../api/html'
 ]
@@ -134,6 +138,3 @@
 
 subprocess.call('make -C ../../Sming submodules SMING_ARCH=Host', shell=True)
 subprocess.call('make -C .. setup api API_VERSION="' + version + '"', shell=True)
-
-def setup(app):
-    app.add_stylesheet('custom.css')