Refresh patches
Sophie Brun
2 years ago
| 2 | 2 |
Subject: Keep using filteralchemy name
|
| 3 | 3 |
|
| 4 | 4 |
Forwarded: not-needed
|
| 5 | |
Last-Update: 2021-06-30
|
|
5 |
Last-Update: 2021-08-11
|
| 6 | 6 |
|
| 7 | 7 |
Description: We packaged filteralchemy found here:
|
| 8 | 8 |
https://github.com/infobyte/filteralchemy with name filteralchemy.
|
|
| 10 | 10 |
for python-faraday and there is only one different commit from the
|
| 11 | 11 |
official and unmaintained filteralchemy, we keep this name.
|
| 12 | 12 |
---
|
| 13 | |
requirements.txt | 4 ++--
|
| 14 | |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
13 |
requirements.txt | 2 +-
|
|
14 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
| 15 | 15 |
|
| 16 | 16 |
diff --git a/requirements.txt b/requirements.txt
|
| 17 | |
index d18dee2..128dc2e 100644
|
|
17 |
index a8bed82..8420bf7 100644
|
| 18 | 18 |
--- a/requirements.txt
|
| 19 | 19 |
+++ b/requirements.txt
|
| 20 | |
@@ -25,8 +25,8 @@ SQLAlchemy>=1.2.0,<1.4.0
|
| 21 | |
tqdm>=4.15.0
|
|
20 |
@@ -26,7 +26,7 @@ tqdm>=4.15.0
|
| 22 | 21 |
twisted>=18.9.0
|
| 23 | 22 |
webargs>=7.0.0
|
| 24 | |
-marshmallow-sqlalchemy==0.25.0
|
|
23 |
marshmallow-sqlalchemy>=0.26.1
|
| 25 | 24 |
-filteralchemy-fork
|
| 26 | |
+marshmallow-sqlalchemy
|
| 27 | 25 |
+filteralchemy
|
| 28 | 26 |
filedepot>=0.5.0
|
| 29 | 27 |
nplusone>=0.8.1
|
| 13 | 13 |
2 files changed, 4 insertions(+), 1 deletion(-)
|
| 14 | 14 |
|
| 15 | 15 |
diff --git a/faraday/manage.py b/faraday/manage.py
|
| 16 | |
index 836dcc7..fe8730e 100755
|
|
16 |
index 8d6e8e5..b88a8ad 100755
|
| 17 | 17 |
--- a/faraday/manage.py
|
| 18 | 18 |
+++ b/faraday/manage.py
|
| 19 | |
@@ -28,6 +28,9 @@ if platform.system() == "Linux":
|
|
19 |
@@ -29,6 +29,9 @@ if platform.system() == "Linux":
|
| 20 | 20 |
except KeyError:
|
| 21 | 21 |
pass
|
| 22 | 22 |
|
|
| 27 | 27 |
import requests
|
| 28 | 28 |
import alembic.command
|
| 29 | 29 |
diff --git a/requirements.txt b/requirements.txt
|
| 30 | |
index f638885..d18dee2 100644
|
|
30 |
index 93d8893..a8bed82 100644
|
| 31 | 31 |
--- a/requirements.txt
|
| 32 | 32 |
+++ b/requirements.txt
|
| 33 | 33 |
@@ -15,7 +15,7 @@ bleach>=3.3.0
|
| 34 | |
marshmallow>=3.11.0
|
|
34 |
marshmallow>=3.11.0,<3.13.0
|
| 35 | 35 |
Pillow>=4.2.1
|
| 36 | 36 |
psycopg2
|
| 37 | 37 |
-pgcli
|