Skip to content

Commit 1ddf73c

Browse files
authored
🚨 Edit for forward compatibility (#74)
* 🚨 Edit urls.py files for forward compatibility and Change xlrd version for pyexcel-xls * 📝 Add change log in changelog.yml
1 parent d764912 commit 1ddf73c

File tree

6 files changed

+38
-32
lines changed

6 files changed

+38
-32
lines changed

changelog.yml

+8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
name: django-excel
22
organisation: pyexcel-webwares
33
releases:
4+
- changes:
5+
- action: 'Change:'
6+
details:
7+
- Support for django 2.0.x
8+
- Tested against django 4.1
9+
- Change xlrd version <=1.2.0
10+
date: 18.08.2022
11+
version: 0.0.12
412
- changes:
513
- action: Updated
614
details:

mysite/urls.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
from django.conf.urls import include, url
1+
from django.conf.urls import include
2+
from django.urls import re_path
23
from django.contrib import admin
34

45

56
urlpatterns = [
6-
url(r'^admin/', admin.site.urls),
7-
url(r'^polls/', include('polls.urls'))
7+
re_path(r'^admin/', admin.site.urls),
8+
re_path(r'^polls/', include('polls.urls'))
89
]

polls/urls.py

+24-25
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,33 @@
1-
from django.conf.urls import url
1+
from django.urls import re_path
22
from polls import views
33

4-
54
urlpatterns = [
6-
url(r'^$', views.upload, name='uplink'),
7-
url(r'^download/(.*)', views.download, name="download"),
8-
url(r'^download_attachment/(.*)/(.*)', views.download_as_attachment,
9-
name="download_attachment"),
10-
url(r'^exchange/(.*)', views.exchange, name="exchange"),
11-
url(r'^parse/(.*)', views.parse, name="parse"),
12-
url(r'^import/', views.import_data, name="import"),
13-
url(r'^import_sheet/', views.import_sheet, name="import_sheet"),
14-
url(r'^export/(.*)', views.export_data, name="export"),
15-
url(r'^handson_view/', views.handson_table, name="handson_view"),
5+
re_path(r'^$', views.upload, name='uplink'),
6+
re_path(r'^download/(.*)', views.download, name="download"),
7+
re_path(r'^download_attachment/(.*)/(.*)', views.download_as_attachment,
8+
name="download_attachment"),
9+
re_path(r'^exchange/(.*)', views.exchange, name="exchange"),
10+
re_path(r'^parse/(.*)', views.parse, name="parse"),
11+
re_path(r'^import/', views.import_data, name="import"),
12+
re_path(r'^import_sheet/', views.import_sheet, name="import_sheet"),
13+
re_path(r'^export/(.*)', views.export_data, name="export"),
14+
re_path(r'^handson_view/', views.handson_table, name="handson_view"),
1615

1716
# handson table view
18-
url(r'^embedded_handson_view/',
19-
views.embed_handson_table, name="embed_handson_view"),
20-
url(r'^embedded_handson_view_single/',
21-
views.embed_handson_table_from_a_single_table,
22-
name="embed_handson_view"),
17+
re_path(r'^embedded_handson_view/',
18+
views.embed_handson_table, name="embed_handson_view"),
19+
re_path(r'^embedded_handson_view_single/',
20+
views.embed_handson_table_from_a_single_table,
21+
name="embed_handson_view"),
2322
# survey_result
24-
url('^survey_result/',
25-
views.survey_result, name='survey_result'),
23+
re_path('^survey_result/',
24+
views.survey_result, name='survey_result'),
2625

2726
# testing purpose
28-
url(r'^import_using_isave/',
29-
views.import_data_using_isave_book_as),
30-
url(r'^import_sheet_using_isave/',
31-
views.import_sheet_using_isave_to_database),
32-
url(r'^import_without_bulk_save/',
33-
views.import_without_bulk_save, name="import_no_bulk_save")
27+
re_path(r'^import_using_isave/',
28+
views.import_data_using_isave_book_as),
29+
re_path(r'^import_sheet_using_isave/',
30+
views.import_sheet_using_isave_to_database),
31+
re_path(r'^import_without_bulk_save/',
32+
views.import_without_bulk_save, name="import_no_bulk_save")
3433
]

requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
pyexcel>=0.5.7
22
pyexcel-webio>=0.1.2
3-
Django>=1.6.1
3+
Django>=2.0

testResponse.py

-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88
from django.test import Client, TestCase
99
from django.test.utils import override_settings
1010
import pyexcel as pe
11-
import pyexcel.ext.xls # noqa
12-
import pyexcel.ext.xlsx # noqa
13-
import pyexcel.ext.ods3 # noqa
1411
from django_excel._compact import urllib_quote
1512
from django_excel import ExcelInMemoryUploadedFile
1613
from nose.tools import eq_

tests/requirements.txt

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
xlrd<=1.2.0
12
nose
23
mock;python_version<"3"
34
codecov

0 commit comments

Comments
 (0)