diff --git a/requirements/base.in b/requirements/base.in index 864c2da3..dcd9e3aa 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -6,8 +6,8 @@ jsonschema furl # Django libraries -git+https://github.com/maykinmedia/django-setup-configuration.git@feature/1-config-command django-log-outgoing-requests +django-setup-configuration # Common ground libraries notifications-api-common diff --git a/requirements/base.txt b/requirements/base.txt index b98e8394..3118ea4d 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -138,7 +138,7 @@ django-rest-framework-condition==0.1.1 # via commonground-api-common django-sendfile2==0.7.0 # via django-privates -django-setup-configuration @ git+https://github.com/maykinmedia/django-setup-configuration.git@feature/1-config-command +django-setup-configuration==0.1.0 # via -r requirements/base.in django-simple-certmanager==1.4.1 # via zgw-consumers @@ -302,16 +302,10 @@ sentry-sdk==1.39.2 # via open-api-framework six==1.16.0 # via -<<<<<<< HEAD # bleach - # isodate -======= - # django-markup # furl # isodate - # jsonschema # orderedmultidict ->>>>>>> 6096ba9 (:sparkles: [https://github.com/maykinmedia/django-setup-configuration/issues/1] add configuration steps) # python-dateutil # qrcode # requests-mock diff --git a/requirements/ci.txt b/requirements/ci.txt index 67189ffc..3e5aa95e 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -208,7 +208,7 @@ django-sendfile2==0.7.0 # via # -r requirements/base.txt # django-privates -django-setup-configuration @ git+https://github.com/maykinmedia/django-setup-configuration.git@feature/1-config-command +django-setup-configuration==0.1.0 # via -r requirements/base.txt django-simple-certmanager==1.4.1 # via @@ -477,7 +477,9 @@ six==1.16.0 # via # -r requirements/base.txt # bleach + # furl # isodate + # orderedmultidict # python-dateutil # qrcode # requests-mock diff --git a/requirements/dev.txt b/requirements/dev.txt index a1f3aa0e..bfded5e3 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -234,7 +234,7 @@ django-sendfile2==0.7.0 # via # -r requirements/ci.txt # django-privates -django-setup-configuration @ git+https://github.com/maykinmedia/django-setup-configuration.git@feature/1-config-command +django-setup-configuration==0.1.0 # via -r requirements/ci.txt django-simple-certmanager==1.4.1 # via @@ -412,6 +412,10 @@ notifications-api-common==0.2.2 # commonground-api-common open-api-framework==0.2.0 # via -r requirements/ci.txt +orderedmultidict==1.0.1 + # via + # -r requirements/ci.txt + # furl oyaml==1.0 # via # -r requirements/ci.txt @@ -540,7 +544,9 @@ six==1.16.0 # via # -r requirements/ci.txt # bleach + # furl # isodate + # orderedmultidict # python-dateutil # qrcode # requests-mock