Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ImportError: cannot import name 'json' from 'itsdangerous' #125

Merged
merged 2 commits into from
Feb 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.2.32] - 2022-02-18
### Updated
- Flask requirement

## [1.2.31] - 2022-01-20
### Updated
- requirements
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# OctoBot-Services [1.2.31](https://github.com/Drakkar-Software/OctoBot-Services/tree/master/docs/CHANGELOG.md)
# OctoBot-Services [1.2.32](https://github.com/Drakkar-Software/OctoBot-Services/tree/master/docs/CHANGELOG.md)
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/31a1caa6e5384d80bf890dba5c9b5e4b)](https://app.codacy.com/gh/Drakkar-Software/OctoBot-Services?utm_source=github.com&utm_medium=referral&utm_content=Drakkar-Software/OctoBot-Services&utm_campaign=Badge_Grade_Dashboard)
[![PyPI](https://img.shields.io/pypi/v/OctoBot-Services.svg)](https://pypi.python.org/pypi/OctoBot-Services/)
[![Github-Action-CI](https://github.com/Drakkar-Software/OctoBot-Services/workflows/OctoBot-Services-CI/badge.svg)](https://github.com/Drakkar-Software/OctoBot-Services/actions)
Expand Down
2 changes: 1 addition & 1 deletion octobot_services/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
# License along with this library.

PROJECT_NAME = "OctoBot-Services"
VERSION = "1.2.31" # major.minor.revision
VERSION = "1.2.32" # major.minor.revision
10 changes: 6 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Drakkar-Software requirements
Async-Channel>=2.0.13, <2.1
OctoBot-Commons>=1.6.20, <1.7
OctoBot-Trading>=2.1.0, <2.2
OctoBot-Trading>=2.1.2, <2.2

# Services
# Reddit
Expand All @@ -17,16 +17,18 @@ simplifiedpytrends>=1.1.2
pyngrok==5.0.5
# Web
## http server
flask==1.1.2
flask==2.0.3
# Flask templates
jinja2>=3.0.3
## flask minification
flask-compress==1.10.1
## flask cache
flask-caching==1.10.1
## flask user authentication management
flask-login==0.5.0
## user form validators
WTForms==2.3.3
Flask-WTF==0.14.3
WTForms==3.0.1
Flask-WTF==1.0.0
## websockets
### used by the webhook service and flask-socketio for the web interface
gevent==21.1.2
Expand Down