Skip to content

Commit fd06de3

Browse files
committed
Fix dependency issue with marshmallow (#1418)
1 parent a802221 commit fd06de3

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
## 8.16.1 (Unreleased)
22

3+
This release fixes an install issue created by a dependency that resulted in an incompatible software version of another dependency.
4+
35
This release introduces the ability to override MYCODO_DB_PATH, SQLALCHEMY_DATABASE_URI, and ALEMBIC_URL in mycodo/config.py to use an alternate settings database. This is accomplished by creating these variables in mycodo/config_override.py. This new config file will be checked on startup and will persist after upgrades.
46

57
### Bugfixes
68

9+
- Fix dependency issue with marshmallow ([#1418](https://github.com/kizniche/Mycodo/issues/1418))
710
- Fix Atlas EC and pH Inputs losing measurements when calibration temperature is None
811
- Fix restoring mycodo/user_scripts during upgrade
912
- Fix documentation generation

install/requirements.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ bcrypt==4.1.2
55
distro==1.9.0
66
email_validator==2.1.0.post1
77
filelock==3.13.1
8-
Flask==3.0.0
8+
Flask==3.1.0
99
Flask_Accept==0.0.6
1010
Flask_Babel==4.0.0
1111
Flask_Compress==1.14
1212
Flask_Limiter==3.5.0
1313
Flask_Login==0.6.3
14-
Flask_Marshmallow==0.15.0
14+
Flask_Marshmallow==1.3.0
1515
#Flask_Profiler==1.8.1 # only use when profiling (uncomment and enable in config.py)
1616
Flask_RESTX==1.3.0
1717
Flask_Session==0.5.0
@@ -24,12 +24,12 @@ importlib_metadata==6.8.0
2424
influxdb==5.3.2 # Only used for stats. TODO: update to influxdb_client and remove
2525
influxdb_client[ciso]==1.48.0
2626
MarkupSafe==2.1.3
27-
marshmallow_sqlalchemy==0.30.0
27+
marshmallow_sqlalchemy==1.4.2
2828
pyro5==5.15
2929
pyserial==3.5
3030
python-dateutil==2.8.2
3131
requests==2.31.0
3232
setuptools==69.0.3
3333
SQLAlchemy==2.0.25
34-
Werkzeug==3.0.1
34+
Werkzeug==3.1.3
3535
WTForms==3.1.2

0 commit comments

Comments
 (0)