Skip to content

Commit

Permalink
Merge pull request saleor#5382 from patrys/drop-silk
Browse files Browse the repository at this point in the history
Drop django-silk
  • Loading branch information
maarcingebala authored Mar 24, 2020
2 parents 5f83fcd + 687a462 commit ddab2ed
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 84 deletions.
68 changes: 4 additions & 64 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ django-phonenumber-field = "^2.4"
django-prices = "^2.1"
django-prices-openexchangerates = "^1.0.1"
django-prices-vatlayer = "^1.0.2"
django-silk = "~2.0"
django-storages = { version = "^1.7.1", extras = [ "google" ] }
django-templated-email = "^2.3.0"
django-versatileimagefield = "^2.0"
Expand Down
7 changes: 0 additions & 7 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
amqp==2.5.2
aniso8601==7.0.0
asgiref==3.2.3
autopep8==1.5
babel==2.7.0
beautifulsoup4==4.7.1
billiard==3.6.3.0
Expand Down Expand Up @@ -32,7 +31,6 @@ django-prices==2.2.0
django-prices-openexchangerates==1.1.0
django-prices-vatlayer==1.0.2
django-render-block==0.6
django-silk==2.0.0
django-storages==1.9.1
django-templated-email==2.3.0
django-versatileimagefield==2.0
Expand All @@ -49,7 +47,6 @@ google-i18n-address==2.3.5
google-measurement-protocol==1.0.0
google-resumable-media==0.5.0
googleapis-common-protos==1.51.0
gprof2dot==2016.10.13
graphene==2.1.8
graphene-django==2.8.2
graphene-django-optimizer==0.6.1
Expand All @@ -60,13 +57,11 @@ html-to-draftjs==1.0.1
html5lib==1.0.1
idna==2.9
jaeger-client==4.3.0
jinja2==2.11.1
jmespath==0.9.4
jsonfield==3.0.0
kombu==4.6.8
lxml==4.5.0
markdown==3.2.1
markupsafe==1.1.1
maxminddb==1.5.2
maxminddb-geolite2==2018.703
measurement==3.2.0
Expand All @@ -82,9 +77,7 @@ psycopg2-binary==2.8.4
purl==1.5
pyasn1==0.4.8
pyasn1-modules==0.2.8
pycodestyle==2.5.0
pycparser==2.19
pygments==2.5.2
pyjwt==1.7.1
pyphen==0.9.5
python-dateutil==2.8.1
Expand Down
4 changes: 0 additions & 4 deletions requirements_dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ aspy.yaml==1.3.0
astroid==2.3.3
atomicwrites==1.3.0; sys_platform == "win32"
attrs==19.3.0
autopep8==1.5
babel==2.7.0
beautifulsoup4==4.7.1
beautifultable==0.7.0
Expand Down Expand Up @@ -50,7 +49,6 @@ django-prices==2.2.0
django-prices-openexchangerates==1.1.0
django-prices-vatlayer==1.0.2
django-render-block==0.6
django-silk==2.0.0
django-storages==1.9.1
django-stubs==1.2.0
django-templated-email==2.3.0
Expand All @@ -72,7 +70,6 @@ google-i18n-address==2.3.5
google-measurement-protocol==1.0.0
google-resumable-media==0.5.0
googleapis-common-protos==1.51.0
gprof2dot==2016.10.13
graphene==2.1.8
graphene-django==2.8.2
graphene-django-optimizer==0.6.1
Expand Down Expand Up @@ -123,7 +120,6 @@ pycodestyle==2.5.0
pycparser==2.19
pydocstyle==4.0.1
pyflakes==2.1.1
pygments==2.5.2
pyjwt==1.7.1
pylint==2.4.4
pylint-celery==0.3
Expand Down
5 changes: 0 additions & 5 deletions saleor/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -264,11 +264,6 @@ def get_bool_from_env(name, default_value):
]
DEBUG_TOOLBAR_CONFIG = {"RESULTS_CACHE_SIZE": 100}

ENABLE_SILK = get_bool_from_env("ENABLE_SILK", False)
if ENABLE_SILK:
MIDDLEWARE.insert(0, "silk.middleware.SilkyMiddleware")
INSTALLED_APPS.append("silk")

LOGGING = {
"version": 1,
"disable_existing_loggers": False,
Expand Down
3 changes: 0 additions & 3 deletions saleor/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,3 @@
url(r"^static/(?P<path>.*)$", serve),
url(r"^", RedirectView.as_view(url="/graphql/")),
]

if settings.ENABLE_SILK:
urlpatterns += [url(r"^silk/", include("silk.urls", namespace="silk"))]

0 comments on commit ddab2ed

Please sign in to comment.