Skip to content

Commit 4523db2

Browse files
authored
Merge pull request #2397 from slaff/release/4.4.1
Release: 4.4.1
2 parents 910eb17 + d2a2a49 commit 4523db2

File tree

7 files changed

+22
-16
lines changed

7 files changed

+22
-16
lines changed

.readthedocs.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@ version: 2
88
# Optionally build your docs in additional formats such as PDF and ePub
99
formats:
1010
- htmlzip
11-
# - pdf
11+
12+
sphinx:
13+
configuration: docs/source/conf.py
1214

1315
# Optionally set the version of Python and requirements required to build your docs
1416
python:
15-
version: 3.7
17+
version: 3.8
1618
install:
1719
- requirements: docs/requirements.txt
1820

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ Supported SDK: ESP-IDF v4.3. See https://sming.readthedocs.io/en/latest/_inc/Smi
117117

118118
### Stable
119119

120-
- [Sming V4.4.0](https://github.com/SmingHub/Sming/releases/tag/4.4.0) - great new features, performance and stability improvements.
120+
- [Sming V4.4.1](https://github.com/SmingHub/Sming/releases/tag/4.4.1) - great new features, performance and stability improvements.
121121

122122

123123
### Long Term Support (LTS)

Sming/Arch/Esp32/Components/esp32/component.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ SDK_COMPONENTS += \
117117
esp_wifi \
118118
esp_eth \
119119
lwip \
120-
mbedtls \
121120
mbedcrypto \
122121
esp_netif \
123122
openssl

Sming/Arch/Esp32/Components/esp32/sdk/config/common

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,8 @@ CONFIG_VFS_SUPPORT_DIR=n
3737
CONFIG_VFS_SUPPORT_SELECT=n
3838
CONFIG_VFS_SUPPORT_TERMIOS=n
3939

40+
# Not used
41+
CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=n
42+
4043
# Debugging
4144
CONFIG_ESP_SYSTEM_PANIC_GDBSTUB=y

Sming/Core/SmingVersion.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#define SMING_MAJOR_VERSION 4
99
#define SMING_MINOR_VERSION 4
10-
#define SMING_PATCH_VERSION 0
10+
#define SMING_PATCH_VERSION 1
1111
#define SMING_PRE_RELEASE ""
1212

1313
#define MACROQUOT(x) #x

docs/requirements.txt

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
# Requirements file for pip
22
# list of Python packages used in documentation build
3-
sphinx==2.4.4
4-
sphinx-rtd-theme
5-
m2r
6-
breathe==4.13.0
3+
sphinx==4.2.0
4+
sphinx-rtd-theme==1.0.0
5+
m2r2
6+
breathe==4.31.0
77
sphinxcontrib-wavedrom
88
sphinx-copybutton
9-
sphinxcontrib-seqdiag>=0.8.5
10-
jinja2>=2.11.3
11-
setuptools==57.5.0
9+
sphinxcontrib-seqdiag==2.0.0
10+
jinja2==2.11.3
11+
setuptools>=57.5.0
12+
funcparserlib==1.0.0a0

docs/source/conf.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
# so developers can more easily locate the appropriate reference documentation.
4646
#
4747
extensions = [
48-
'm2r',
48+
'm2r2',
4949
'breathe',
5050
'sphinxcontrib.seqdiag',
5151
'link-roles',
@@ -101,6 +101,10 @@
101101
# so a file named "default.css" will overwrite the builtin "default.css".
102102
html_static_path = ['_static']
103103

104+
html_css_files = [
105+
'custom.css',
106+
]
107+
104108
html_extra_path = [
105109
'../api/html'
106110
]
@@ -134,6 +138,3 @@
134138

135139
subprocess.call('make -C ../../Sming submodules SMING_ARCH=Host', shell=True)
136140
subprocess.call('make -C .. setup api API_VERSION="' + version + '"', shell=True)
137-
138-
def setup(app):
139-
app.add_stylesheet('custom.css')

0 commit comments

Comments
 (0)