Commit Graph

960 Commits

Author SHA1 Message Date
Bojan Mihelac 657b7d72b3
Merge pull request #771 from jdufresne/pyreq
Pass python_requires argument to setuptools
2018-04-17 08:22:19 +02:00
Jon Dufresne c27f8b3147 Pass python_requires argument to setuptools
Helps pip decide what version of the library to install.

https://packaging.python.org/tutorials/distributing-packages/#python-requires

> If your project only runs on certain Python versions, setting the
> python_requires argument to the appropriate PEP 440 version specifier
> string will prevent pip from installing the project on other Python
> versions.

https://setuptools.readthedocs.io/en/latest/setuptools.html#new-and-changed-setup-keywords

> python_requires
>
> A string corresponding to a version specifier (as defined in PEP 440)
> for the Python version, used to specify the Requires-Python defined in
> PEP 345.
2018-04-12 03:27:21 -07:00
Bojan Mihelac 7645954f24
Update AUTHORS 2018-03-01 09:57:05 +01:00
Bojan Mihelac df5ef198c2
Update changelog.rst 2018-03-01 09:56:23 +01:00
Bojan Mihelac 5940bf5395
Merge pull request #719 from frnhr/action_form_on_grappelli
custom js for action form also handles grappelli
2018-03-01 09:55:38 +01:00
Bojan Mihelac a279f3c2df
Update changelog.rst 2018-03-01 09:19:39 +01:00
Bojan Mihelac 16af9fd033
Merge pull request #732 from mgrdcm/app_label
Use 'verbose_name' in breadcrumbs to match Django default.
2018-03-01 09:19:15 +01:00
Bojan Mihelac 63b45c1fec
Update changelog.rst 2018-03-01 09:06:52 +01:00
Bojan Mihelac ce344efb0f
Merge pull request #746 from kimetrica/745-custom-diff-classes
Add Resource.get_diff_class() - fixes #745
2018-03-01 09:06:33 +01:00
Bojan Mihelac ec21f44e71
Update changelog.rst 2018-03-01 09:01:40 +01:00
Marcin Popławski 4d3c9f22d3 Fix and add polish translation (#747) 2018-03-01 09:01:23 +01:00
Bojan Mihelac d40eb54e89
Update changelog.rst 2018-03-01 08:58:55 +01:00
Bojan Mihelac e1fd702fa1
Merge pull request #749 from kimetrica/add_before_import_raise_errors
Restore raise_errors to before_import
2018-03-01 08:58:19 +01:00
Roger Hunwicks b6d9d32b90 Restore raise_errors to before_import - see #399 2018-02-27 08:34:56 +02:00
Roger Hunwicks 33fd5e9052 Add Resource.get_diff_class() - fixes #745 2018-02-22 18:45:06 +02:00
Manel Clos 158a1064e8
Merge pull request #743 from GregKaleka/patch-1
Edit docblock for ForeignKeyWidget
2018-02-21 17:23:53 +01:00
Greg Kaleka 1f0a3f0e5a
Edit docblock for ForeignKeyWidget
Adds import statements to the example in the ForeignKeyWidget docblock.
2018-02-20 13:09:57 -08:00
Bojan Mihelac 56603f5684 chore: add Django 1.11 to tox config 2018-02-14 08:08:09 +01:00
Bojan Mihelac bddd494503 Back to development: 1.0.1 2018-02-13 09:49:47 +01:00
Bojan Mihelac 690f126e57 Preparing release 1.0.0 2018-02-13 09:49:01 +01:00
Bojan Mihelac 3b9be417e0 Update changelog for 1.0.0 2018-02-13 09:48:40 +01:00
Bojan Mihelac ddc15271d7
Merge pull request #737 from bmihelac/upgrade-tox-config
Upgrade tox configuration
2018-02-13 09:42:31 +01:00
Bojan Mihelac 50227131fd Upgrade tox configuration
Add supported Django versions
Add supported python versions
Use openpyxl==2.4.11 as 2.5.x drops support for python 3.3
2018-02-06 21:17:24 +01:00
Bojan Mihelac 5794ab8fbb Update next release in CHANGELOG 2018-02-06 17:53:37 +01:00
Bojan Mihelac e6d9be730b Merge branch 'mgrdcm-require-django-1-8' 2018-02-06 17:50:28 +01:00
Dan Moore 4db2615059 Use 'verbose_name' in breadcrumbs to match Django default. 2018-01-28 00:11:47 -05:00
Dan Moore 87afec415b Merge branch 'master' of https://github.com/django-import-export/django-import-export into require-django-1-8 2018-01-27 23:47:59 -05:00
Bojan Mihelac 318208cddd Back to development: 0.7.1 2018-01-17 08:06:23 +01:00
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
Fran Hrženjak 70f236f36d
custom js for action form also handles grappelli 2017-12-29 04:07:52 +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