Commit Graph

916 Commits

Author SHA1 Message Date
Bojan Mihelac 7eb60565d9 Preparing release 0.7.0 2018-01-17 08:05:54 +01:00
Bojan Mihelac 4a9bd312a9
Merge pull request #727 from bmihelac/prepare-0.7.0
prepare 0.7.0
2018-01-17 08:04:48 +01:00
Bojan Mihelac 5e143d40f2 prepare 0.7.0 2018-01-11 13:59:44 +01:00
Bojan Mihelac fc6ef3e615
Merge pull request #702 from int-ua/master
skip_row override example, adding myself to AUTHORS
2018-01-11 09:23:44 +01:00
Serhiy Zahoriya 0d08f30468
Merge branch 'master' into master 2017-12-28 21:56:15 +02:00
Bojan Mihelac d0157e2a6b
Merge pull request #705 from bmihelac/fix-548-zip-false
discourage installation as a zipped eggs, thanks @machakux (#548)
2017-12-13 08:16:45 +01:00
Bojan Mihelac bcd63661a0
Merge branch 'master' into fix-548-zip-false 2017-12-13 08:16:19 +01:00
Bojan Mihelac 7c175af129
Merge pull request #709 from django-import-export/travis-remove-django-2.0-allowed-failure
Testing against Django 2.0 should not fail
2017-12-13 08:15:37 +01:00
Bojan Mihelac 9a32c6e08b
Merge pull request #690 from bmihelac/refactor-transaction-handling
Refactor transaction handling
2017-12-13 08:15:07 +01:00
Manel Clos 62994a445e Django 2.0 is the last version to support Python 3.4 2017-12-12 20:23:53 +01:00
Manel Clos 08588ea837 Testing against Django 2.0 should not fail 2017-12-12 19:45:59 +01:00
Bojan Mihelac 1ba6790bdb
Merge pull request #707 from bmihelac/fix-saving-m2m-after-695
fix saving m2m in Django<1.9 after #695
2017-12-11 13:35:27 +01:00
Bojan Mihelac bc3f439e7e fix saving m2m in Django<1.9 after #695 2017-12-11 13:16:19 +01:00
Bojan Mihelac e7a41ad014
Merge pull request #695 from gnucoop/fix-django2-m2m-import
use ManyToManyRelatedManager.set method to save m2m fields
2017-12-11 12:44:49 +01:00
Bojan Mihelac 3ea4316615
Merge pull request #697 from gnucoop/fix-django2-middleware-settings
MIDDLEWARE_CLASSES django setting removed in 2.x
2017-12-11 12:41:06 +01:00
Bojan Mihelac d9768ae30d
Merge branch 'master' into fix-django2-middleware-settings 2017-12-11 12:40:50 +01:00
Bojan Mihelac db2dc519ab
Merge branch 'master' into fix-django2-middleware-settings 2017-12-11 12:40:14 +01:00
Bojan Mihelac ca9dbe44a1
Merge pull request #704 from krishraghuram/fix-703-fields-shadow
Resolves #703 fields shadowed
2017-12-11 09:39:59 +01:00
Raghuram Krishnaswami 00198d3376 Added myself to AUTHORS 2017-12-11 14:09:18 +05:30
Bojan Mihelac 05983497e4 discourage installation as a zipped eggs, thanks @machakux (#548) 2017-12-11 09:23:34 +01:00
Raghuram Krishnaswami b54b501b10 Resolves #703 2017-12-11 13:40:43 +05:30
Serhiy Zahoriya c939cf9563 skip_row override example, adding myself to AUTHORS that also stripped an unneeded space 2017-12-10 08:06:19 +02:00
trik d36a43b914 update changelog and authors 2017-12-08 20:11:10 +01:00
trik 95dd3040cb add import m2m failing test case 2017-12-06 17:49:54 +01:00
trik c03e3ae6c0 MIDDLEWARE_CLASSES django setting removed in 2.x 2017-12-06 17:29:32 +01:00
trik 42daa5b022 use ManyToManyRelatedManager.set method to save m2m fields
fixes #694
2017-12-06 17:16:50 +01:00
Bojan Mihelac dd1c0852ba Refactor transaction handling
Add `atomic_if_using_transaction` context manager and use it instead of
if/else statements.

Wrap `before_import`, `import_row`, `after_import` calls into
`atomic_if_using_transaction`.

Add tests.

Refs: #609, #399, #610
2017-12-04 14:51:12 +01:00
Bojan Mihelac 859641a61f Back to development: 0.6.2 2017-12-04 11:58:47 +01:00
Bojan Mihelac f185eac177 Preparing release 0.6.1 2017-12-04 11:58:23 +01:00
Bojan Mihelac 028b2df910
Merge pull request #688 from bmihelac/prepare-0.6.1
Prepare changelog for 0.6.1
2017-12-04 11:58:01 +01:00
Bojan Mihelac ec18234534 updates changelog 2017-12-04 11:56:33 +01:00
Bojan Mihelac 62f0e16b36
Merge pull request #682 from mgrdcm/copyright-2017
Update documentation copyright date through 2017.
2017-12-03 10:11:31 +01:00
Bojan Mihelac 1181c73caf
Merge pull request #691 from mgrdcm/travis-django-2
Travis tests for Django 2.0.x
2017-12-03 10:08:44 +01:00
Dan Moore 216b697306 Travis tests for Django 2.0.x
2.0 not completely supported by this package yet, but at least wanted to get them into the list.
2017-12-02 18:02:58 -05:00
Bojan Mihelac fa1d0653fd Prepare changelog for 0.6.1 2017-11-28 16:11:35 +01:00
Bojan Mihelac af3583544c
Merge pull request #686 from mgrdcm/test-django-1-11-with-python3-6
Travis tests for Python 3.6 on Django >= 11
2017-11-28 13:50:24 +01:00
Bojan Mihelac 77e20b5c7b
Merge pull request #632 from jdufresne/keys
Remove unnecessary calls to dict.keys()
2017-11-28 13:44:48 +01:00
Dan Moore deb26257c6 Don't need to test Django 1.10 in Python 3.6. 2017-11-24 16:49:11 -05:00
Dan Moore a7397fe349 Travis tests for Python 3.6 on Django >= 11
Django 1.11 and newer support Python 3.6.
2017-11-24 14:49:45 -05:00
Bojan Mihelac 70b29bf4b2
Merge pull request #684 from jdufresne/classifiers
Add trove classifiers for all supported Python versions
2017-11-24 14:44:25 +01:00
Bojan Mihelac f47173b422
Merge pull request #636 from jdufresne/clean-twice
Avoid calling Field.clean() unnecessarily twice
2017-11-24 14:36:10 +01:00
Bojan Mihelac 0f5cfc8df2
Merge pull request #631 from jdufresne/ordereddict
Remove workaround for Python 2.6 wrt OrderedDict
2017-11-24 14:35:14 +01:00
Bojan Mihelac 609a2e3954
Merge pull request #629 from jdufresne/pip-cache
Add pip caching support to Travis CI configuration
2017-11-24 14:34:52 +01:00
Bojan Mihelac 2460ff0270
Merge pull request #635 from jdufresne/wheel
Add universal wheel support
2017-11-24 14:34:24 +01:00
Bojan Mihelac 5123975e30
Merge pull request #683 from jdufresne/authors
Add myself to the list of AUTHORS
2017-11-24 14:30:36 +01:00
Jon Dufresne 0d3481a2ee Add trove classifiers for all supported Python versions 2017-11-24 04:57:51 -08:00
Jon Dufresne 0fb44a663f Add universal wheel support
As django-import-export is a pure Python package (no C code), it can be
packaged as a universal wheel. Enable this in setup.cfg. Also configure
zest to build the wheel by default.

For information on using wheels see:

http://pythonwheels.com/

For information on the wheel specification see PEP-0427:

https://www.python.org/dev/peps/pep-0427/

For information on creating wheels with zest see:

https://zestreleaser.readthedocs.io/en/latest/uploading.html#uploading-wheels
2017-11-24 04:51:12 -08:00
Jon Dufresne 27f9c277a1 Add myself to the list of AUTHORS 2017-11-24 04:48:17 -08:00
Jon Dufresne a6d10c6399 Add pip caching support to Travis CI configuration
Helps reduces requests to PyPI.

See TravisCI docs for details on cache:

https://docs.travis-ci.com/user/caching/#pip-cache
2017-11-24 04:46:32 -08:00
Jon Dufresne 038cae69c9 Remove workaround for Python 2.6 wrt OrderedDict
collections.OrderedDict was added to Python starting with 2.7. As
django-import-export only supports Python 2.7+ or Python 3.3+, can
safely rely on the stdlib version of OrderedDict.
2017-11-24 04:46:19 -08:00