diff options
author | nicolargo <nicolas@nicolargo.com> | 2022-11-19 16:08:18 +0100 |
---|---|---|
committer | nicolargo <nicolas@nicolargo.com> | 2022-11-19 16:08:18 +0100 |
commit | 70aa46d4a0b6ad8ff6f4aa02eaad1d938ab891e3 (patch) | |
tree | dfdcb8b54cd2247ea7c895049487969b44a1b082 /requirements.txt | |
parent | d6818c9c3afeb82c574c7c79dbd23a9a2adbede6 (diff) | |
parent | ea60836cc9bc540202a7d2783d8bd43bd0e06bd2 (diff) |
Solve conflicts
Diffstat (limited to 'requirements.txt')
-rw-r--r-- | requirements.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/requirements.txt b/requirements.txt index f1f08dfc..89d1e3df 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,6 @@ -psutil>=5.3.0 +psutil>=5.6.7 defusedxml packaging +ujson<4; python_version >= "3.5" and python_version < "3.6" +ujson<5; python_version >= "3.6" and python_version < "3.7" +ujson; python_version >= "3.7" |