From 801bad7c6134e84016d4d1d6ade85c416ce442a5 Mon Sep 17 00:00:00 2001 From: Maxim Kukhtenkov Date: Wed, 6 Jun 2018 15:01:22 -0400 Subject: [PATCH 01/15] Update copyright and version number in Docs config --- docs/conf.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index faba401..c8ecb3b 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -44,16 +44,16 @@ master_doc = 'index' # General information about the project. project = u'django-rest-auth' -copyright = u'2014, Tivix Inc.' +copyright = u'2018, Tivix Inc.' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the # built documents. # # The short X.Y version. -version = '0.3.0' +version = '0.9.3' # The full version, including alpha/beta/rc tags. -release = '0.3.0' +release = '0.9.3' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. From 95fafe5e0f6716296a1c664c2b870876a6b4e0cc Mon Sep 17 00:00:00 2001 From: Maxim Kukhtenkov Date: Wed, 6 Jun 2018 17:10:43 -0400 Subject: [PATCH 02/15] Remove Django 1.8 from Travis config --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b05a3f7..c296c2b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ python: - "3.5" - "3.6" env: - - DJANGO=1.8.* DRF=3.6.* - DJANGO=1.11.* DRF=3.7.* - DJANGO=2.0.* DRF=3.7.* install: From 90760548f6905c5f251a3df6c9f00057b954bac3 Mon Sep 17 00:00:00 2001 From: Daniel <33256939+dgilge@users.noreply.github.com> Date: Mon, 11 Jun 2018 08:46:59 +0200 Subject: [PATCH 03/15] Add DRF 3.8 to Travis config --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index c296c2b..5ca0bf6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,9 @@ python: - "3.6" env: - DJANGO=1.11.* DRF=3.7.* + - DJANGO=1.11.* DRF=3.8.* - DJANGO=2.0.* DRF=3.7.* + - DJANGO=2.0.* DRF=3.8.* install: - pip install -q Django==$DJANGO djangorestframework==$DRF - pip install coveralls @@ -20,3 +22,4 @@ matrix: exclude: - python: "2.7" env: DJANGO=2.0.* DRF=3.7.* + env: DJANGO=2.0.* DRF=3.8.* From db60e433974018d30baf72e224c94463822c387f Mon Sep 17 00:00:00 2001 From: Daniel <33256939+dgilge@users.noreply.github.com> Date: Mon, 11 Jun 2018 09:02:02 +0200 Subject: [PATCH 04/15] Exclude Python 2.7 for Django 2.0 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 5ca0bf6..b059c1e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,4 +22,5 @@ matrix: exclude: - python: "2.7" env: DJANGO=2.0.* DRF=3.7.* + - python: "2.7" env: DJANGO=2.0.* DRF=3.8.* From a1845aef434c788561b88616bb151abaa7e9c67b Mon Sep 17 00:00:00 2001 From: Daniel <33256939+dgilge@users.noreply.github.com> Date: Thu, 14 Jun 2018 00:06:20 +0200 Subject: [PATCH 05/15] Pass request to authenticate --- rest_auth/serializers.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/rest_auth/serializers.py b/rest_auth/serializers.py index 45729b2..2ea6550 100644 --- a/rest_auth/serializers.py +++ b/rest_auth/serializers.py @@ -21,11 +21,14 @@ class LoginSerializer(serializers.Serializer): email = serializers.EmailField(required=False, allow_blank=True) password = serializers.CharField(style={'input_type': 'password'}) + def authenticate(self, **kwargs): + return authenticate(self.context['request'], **kwargs) + def _validate_email(self, email, password): user = None if email and password: - user = authenticate(email=email, password=password) + user = self.authenticate(email=email, password=password) else: msg = _('Must include "email" and "password".') raise exceptions.ValidationError(msg) @@ -36,7 +39,7 @@ class LoginSerializer(serializers.Serializer): user = None if username and password: - user = authenticate(username=username, password=password) + user = self.authenticate(username=username, password=password) else: msg = _('Must include "username" and "password".') raise exceptions.ValidationError(msg) @@ -47,9 +50,9 @@ class LoginSerializer(serializers.Serializer): user = None if email and password: - user = authenticate(email=email, password=password) + user = self.authenticate(email=email, password=password) elif username and password: - user = authenticate(username=username, password=password) + user = self.authenticate(username=username, password=password) else: msg = _('Must include either "username" or "email" and "password".') raise exceptions.ValidationError(msg) From b9fd4aba96a99f329c71dfe9a68ccf289d7d020a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Dohnal?= Date: Wed, 27 Jun 2018 23:06:34 +0200 Subject: [PATCH 06/15] add czech (cs) translations stub --- rest_auth/locale/cs/LC_MESSAGES/django.po | 103 ++++++++++++++++++++++ 1 file changed, 103 insertions(+) create mode 100644 rest_auth/locale/cs/LC_MESSAGES/django.po diff --git a/rest_auth/locale/cs/LC_MESSAGES/django.po b/rest_auth/locale/cs/LC_MESSAGES/django.po new file mode 100644 index 0000000..3ac6d98 --- /dev/null +++ b/rest_auth/locale/cs/LC_MESSAGES/django.po @@ -0,0 +1,103 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-06-27 23:05+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" + +#: .\registration\serializers.py:67 +msgid "View is not defined, pass it as a context variable" +msgstr "" + +#: .\registration\serializers.py:72 +msgid "Define adapter_class in view" +msgstr "" + +#: .\registration\serializers.py:91 +msgid "Define callback_url in view" +msgstr "" + +#: .\registration\serializers.py:95 +msgid "Define client_class in view" +msgstr "" + +#: .\registration\serializers.py:116 +msgid "Incorrect input. access_token or code is required." +msgstr "" + +#: .\registration\serializers.py:125 +msgid "Incorrect value" +msgstr "" + +#: .\registration\serializers.py:139 +msgid "User is already registered with this e-mail address." +msgstr "" + +#: .\registration\serializers.py:185 +msgid "A user is already registered with this e-mail address." +msgstr "" + +#: .\registration\serializers.py:193 +msgid "The two password fields didn't match." +msgstr "" + +#: .\registration\views.py:51 +msgid "Verification e-mail sent." +msgstr "" + +#: .\registration\views.py:98 +msgid "ok" +msgstr "" + +#: .\serializers.py:30 +msgid "Must include \"email\" and \"password\"." +msgstr "" + +#: .\serializers.py:41 +msgid "Must include \"username\" and \"password\"." +msgstr "" + +#: .\serializers.py:54 +msgid "Must include either \"username\" or \"email\" and \"password\"." +msgstr "" + +#: .\serializers.py:95 +msgid "User account is disabled." +msgstr "" + +#: .\serializers.py:98 +msgid "Unable to log in with provided credentials." +msgstr "" + +#: .\serializers.py:107 +msgid "E-mail is not verified." +msgstr "" + +#: .\views.py:127 +msgid "Successfully logged out." +msgstr "" + +#: .\views.py:175 +msgid "Password reset e-mail has been sent." +msgstr "" + +#: .\views.py:201 +msgid "Password has been reset with the new password." +msgstr "" + +#: .\views.py:223 +msgid "New password has been saved." +msgstr "" From fa3000e8bd5b1c7c3622056d25badb953fbc5cb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Dohnal?= Date: Wed, 27 Jun 2018 23:18:39 +0200 Subject: [PATCH 07/15] add cs translations --- rest_auth/locale/cs/LC_MESSAGES/django.mo | Bin 0 -> 2376 bytes rest_auth/locale/cs/LC_MESSAGES/django.po | 63 +++++++++++----------- 2 files changed, 31 insertions(+), 32 deletions(-) create mode 100644 rest_auth/locale/cs/LC_MESSAGES/django.mo diff --git a/rest_auth/locale/cs/LC_MESSAGES/django.mo b/rest_auth/locale/cs/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..38857f9a881619301ecd04a57fd1aa8bd0febe2f GIT binary patch literal 2376 zcmbW2O>7%Q6vqcB1of%MvC{bG*?IHcoBupN z|GanCb%y6@j2AJ!!*~hf+CBKd^DB4~{0;Q$Blj})0yvqIgU?|80aymFgL}Yl!TsP* z;34o2@D1?5eSJR*V2JrO(A#|mJ`4T;9sqvod0iFQo^Z7@hkM}7E*X&1d z5joxhk70ghH)F4WSHYLTPjY?<`Z(W%N5R|RliZc!5Fyx87!PCM zSnN@ZeHcF9$1xtmfZOc+{{A2tdjezdAVl`ukIzRi3VwEmQYS1)M_gIK<7KjV z>2Q?_Hk~@ZJ5nhui^3nKNLd&{`yeTM(qT?A~JDx5{s5=oI>f?42}|YB5!6nUty3aH|Fq zvbnmTWXTM(fz&E?6w6p2N~pz?s2;L;&8rHA#_#oam{mmEnvRU&DT3ArBe_CJ%={D?uV*jK1?TW<@UesQ zJQ3qmE{%=_rISJVbt)epFTHl8R4$cZ7+e+|>Ame}H=5gBfE9RD)Vy}g0Z2U<=QO@8%*Mt5ldYgr?IL`3bQJ; zTm=`5ZMkvM?QH5Q$0w-&wKAeBmC?g=no2ZIBl=XOOa~8=ezS7IzZ}KO@M#e8%3_S8Lv{^#Hc&&dxdvdb-ZqHUi{*-=7nZK#kz3H^!v%(Ht9ed z*X*uQqt#v0=Kt)_qH1=GI0IGJD2q?kWo0N;rne!q3E36iTNPWEvbK@k0#2t|#1hv% literal 0 HcmV?d00001 diff --git a/rest_auth/locale/cs/LC_MESSAGES/django.po b/rest_auth/locale/cs/LC_MESSAGES/django.po index 3ac6d98..43ab5e5 100644 --- a/rest_auth/locale/cs/LC_MESSAGES/django.po +++ b/rest_auth/locale/cs/LC_MESSAGES/django.po @@ -1,103 +1,102 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# Czech translations of django-rest-auth +# +# This file is distributed under the same license as the django-model-utils package. # -#, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" +"Project-Id-Version: django-rest-auth\n" +"Report-Msgid-Bugs-To: https://github.com/Tivix/django-rest-auth/issues\n" "POT-Creation-Date: 2018-06-27 23:05+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" +"PO-Revision-Date: 2018-06-27 23:15+0200\n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"Last-Translator: Václav Dohnal \n" +"Language-Team: N/A\n" +"X-Generator: Poedit 2.0.8\n" #: .\registration\serializers.py:67 msgid "View is not defined, pass it as a context variable" -msgstr "" +msgstr "View není definováno, předejte jej jako proměnnou kontextu" #: .\registration\serializers.py:72 msgid "Define adapter_class in view" -msgstr "" +msgstr "Definujte adapter_class ve view" #: .\registration\serializers.py:91 msgid "Define callback_url in view" -msgstr "" +msgstr "Definujte callback_url ve view" #: .\registration\serializers.py:95 msgid "Define client_class in view" -msgstr "" +msgstr "Definujte client_class ve view" #: .\registration\serializers.py:116 msgid "Incorrect input. access_token or code is required." -msgstr "" +msgstr "Nesprávný vstup. access_token je povinný." #: .\registration\serializers.py:125 msgid "Incorrect value" -msgstr "" +msgstr "Nesprávná hodnota" #: .\registration\serializers.py:139 msgid "User is already registered with this e-mail address." -msgstr "" +msgstr "Uživatel s touto adresou je již registrován." #: .\registration\serializers.py:185 msgid "A user is already registered with this e-mail address." -msgstr "" +msgstr "Uživatel s touto adresou je již registrován." #: .\registration\serializers.py:193 msgid "The two password fields didn't match." -msgstr "" +msgstr "Zadaná hesla se neshodují." #: .\registration\views.py:51 msgid "Verification e-mail sent." -msgstr "" +msgstr "Ověřovací e-mail odeslán." #: .\registration\views.py:98 msgid "ok" -msgstr "" +msgstr "ok" #: .\serializers.py:30 msgid "Must include \"email\" and \"password\"." -msgstr "" +msgstr "Musí obsahovat \"e-mail\" a \"heslo\"." #: .\serializers.py:41 msgid "Must include \"username\" and \"password\"." -msgstr "" +msgstr "Musí obsahovat \"uživatelské jméno\" a \"heslo\"." #: .\serializers.py:54 msgid "Must include either \"username\" or \"email\" and \"password\"." -msgstr "" +msgstr "Musí obsahovat \"uživatelské jméno\" nebo \"e-mail\" a \"heslo\"." #: .\serializers.py:95 msgid "User account is disabled." -msgstr "" +msgstr "Uživatelský účet je zakázán." #: .\serializers.py:98 msgid "Unable to log in with provided credentials." -msgstr "" +msgstr "Pomocí zadaných údajů se nelze přihlásit." #: .\serializers.py:107 msgid "E-mail is not verified." -msgstr "" +msgstr "E-mail není ověřený." #: .\views.py:127 msgid "Successfully logged out." -msgstr "" +msgstr "Byli jste úspěšně odhlášení." #: .\views.py:175 msgid "Password reset e-mail has been sent." -msgstr "" +msgstr "E-mail pro resetování hesla byl odeslán." #: .\views.py:201 msgid "Password has been reset with the new password." -msgstr "" +msgstr "Vaše heslo bylo resetováno." #: .\views.py:223 msgid "New password has been saved." -msgstr "" +msgstr "Nové heslo bylo uloženo." From 98212a83f5ddacd78b11ea975bbdebc4f15a1fde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Va=C5=A1ek=20Dohnal?= Date: Wed, 27 Jun 2018 23:19:48 +0200 Subject: [PATCH 08/15] fix typo --- rest_auth/locale/cs/LC_MESSAGES/django.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_auth/locale/cs/LC_MESSAGES/django.po b/rest_auth/locale/cs/LC_MESSAGES/django.po index 43ab5e5..d09df89 100644 --- a/rest_auth/locale/cs/LC_MESSAGES/django.po +++ b/rest_auth/locale/cs/LC_MESSAGES/django.po @@ -1,10 +1,10 @@ # Czech translations of django-rest-auth # -# This file is distributed under the same license as the django-model-utils package. +# This file is distributed under the same license as the Tivix/django-rest-auth package. # msgid "" msgstr "" -"Project-Id-Version: django-rest-auth\n" +"Project-Id-Version: Tivix/django-rest-auth\n" "Report-Msgid-Bugs-To: https://github.com/Tivix/django-rest-auth/issues\n" "POT-Creation-Date: 2018-06-27 23:05+0200\n" "PO-Revision-Date: 2018-06-27 23:15+0200\n" From b778a5085b5086527edf706e110ea03f980e77d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Va=C5=A1ek=20Dohnal?= Date: Wed, 27 Jun 2018 23:20:10 +0200 Subject: [PATCH 09/15] add full project name --- rest_auth/locale/cs/LC_MESSAGES/django.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_auth/locale/cs/LC_MESSAGES/django.po b/rest_auth/locale/cs/LC_MESSAGES/django.po index d09df89..57291c7 100644 --- a/rest_auth/locale/cs/LC_MESSAGES/django.po +++ b/rest_auth/locale/cs/LC_MESSAGES/django.po @@ -1,4 +1,4 @@ -# Czech translations of django-rest-auth +# Czech translations of Tivix/django-rest-auth # # This file is distributed under the same license as the Tivix/django-rest-auth package. # From 3af4f1a3438bd7add61c549669c8bd35a68b68db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Va=C5=A1ek=20Dohnal?= Date: Wed, 27 Jun 2018 23:21:56 +0200 Subject: [PATCH 10/15] fix typo --- rest_auth/locale/cs/LC_MESSAGES/django.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_auth/locale/cs/LC_MESSAGES/django.po b/rest_auth/locale/cs/LC_MESSAGES/django.po index 57291c7..7a7b25f 100644 --- a/rest_auth/locale/cs/LC_MESSAGES/django.po +++ b/rest_auth/locale/cs/LC_MESSAGES/django.po @@ -87,7 +87,7 @@ msgstr "E-mail není ověřený." #: .\views.py:127 msgid "Successfully logged out." -msgstr "Byli jste úspěšně odhlášení." +msgstr "Byli jste úspěšně odhlášeni." #: .\views.py:175 msgid "Password reset e-mail has been sent." From 53f901b3c887d4f12219aca64bb6b5ea633b0681 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Dohnal?= Date: Wed, 27 Jun 2018 23:22:38 +0200 Subject: [PATCH 11/15] refresh .mo file --- rest_auth/locale/cs/LC_MESSAGES/django.mo | Bin 2376 -> 2488 bytes rest_auth/locale/cs/LC_MESSAGES/django.po | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_auth/locale/cs/LC_MESSAGES/django.mo b/rest_auth/locale/cs/LC_MESSAGES/django.mo index 38857f9a881619301ecd04a57fd1aa8bd0febe2f..3dd71df01d655839aef82270b73b43c1d635de87 100644 GIT binary patch delta 345 zcmX>hv_p8pnfmLD3=Fqe7#Q>!7#KFOF)+vj=|@0X4oEYxLuf@HEdk^^0BIc{9SNj` zfpi;?RtD0ufV3fy-Up=Zf%FF;Ed`_vI2agYfwVV})&|ma(=EpcGdcs#l@wm#gkcCy_k%QCI_+}u?{=DFgYi& zOu;2TBQG&W!KN$`#MMgya~;xi6Ekx_2HJ7?04**}Oi$GfNlnbPQt;Dv+^otb&%~Iy J*^PsV5dbjTOX2_k delta 251 zcmdlXd_ri#nff$F28LTK3=H}V3=EEJ3=Hx>x)4aq0qKcQdIOM_0P@cRX&oT_0!Rx3 zX;F3t24x_v38W2yv@ejh2h#OGS_(+-2hy@Y`WBGZ2GT!(G)TP)2Lpo)koMqU&;whX z3KUQR3QPskAcyP#(jbj5fV3TuX5(aFU;@&vn=2VhnZ>z+QVa5nN_2gT(=$_aol4V- zbwl#46efGKdNCQAPM*$sM1adDF)zI|F+Ei`BsDSDN@4RfHhCtd!)rHh<6vS007B|1 Ap8x;= diff --git a/rest_auth/locale/cs/LC_MESSAGES/django.po b/rest_auth/locale/cs/LC_MESSAGES/django.po index 7a7b25f..eb8c60c 100644 --- a/rest_auth/locale/cs/LC_MESSAGES/django.po +++ b/rest_auth/locale/cs/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Tivix/django-rest-auth\n" "Report-Msgid-Bugs-To: https://github.com/Tivix/django-rest-auth/issues\n" "POT-Creation-Date: 2018-06-27 23:05+0200\n" -"PO-Revision-Date: 2018-06-27 23:15+0200\n" +"PO-Revision-Date: 2018-06-27 23:22+0200\n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" From 033ee8f483e7c552ed5382120dbd00481fe80ac1 Mon Sep 17 00:00:00 2001 From: Ryan P Kilby Date: Tue, 21 Aug 2018 21:12:28 -0700 Subject: [PATCH 12/15] Remove deprecated EZ setup --- setup.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/setup.py b/setup.py index 2c9dad4..66c4c04 100644 --- a/setup.py +++ b/setup.py @@ -1,14 +1,8 @@ #!/usr/bin/env python -try: - from setuptools import setup, find_packages -except ImportError: - from ez_setup import use_setuptools - use_setuptools() - from setuptools import setup, find_packages - - import os +from setuptools import setup, find_packages + here = os.path.dirname(os.path.abspath(__file__)) f = open(os.path.join(here, 'README.rst')) From f0941b4cc2d23e81c75660a9b032dbab785456ff Mon Sep 17 00:00:00 2001 From: Ryan P Kilby Date: Tue, 21 Aug 2018 21:16:52 -0700 Subject: [PATCH 13/15] Merge tools configs into setup.cfg --- flake8 | 4 ---- .coveragerc => setup.cfg | 15 ++++++++++----- 2 files changed, 10 insertions(+), 9 deletions(-) delete mode 100644 flake8 rename .coveragerc => setup.cfg (77%) diff --git a/flake8 b/flake8 deleted file mode 100644 index 401fdf4..0000000 --- a/flake8 +++ /dev/null @@ -1,4 +0,0 @@ -[flake8] -max-line-length = 120 -exclude = docs/*,demo/* -ignore = F403 \ No newline at end of file diff --git a/.coveragerc b/setup.cfg similarity index 77% rename from .coveragerc rename to setup.cfg index 70d6d0d..3ba7986 100644 --- a/.coveragerc +++ b/setup.cfg @@ -1,8 +1,13 @@ -# .coveragerc to control coverage.py -[run] +[flake8] +max-line-length = 120 +exclude = docs/*,demo/* +ignore = F403 + + +[coverage:run] omit=*site-packages*,*distutils*,*migrations* -[report] +[coverage:report] # Regexes for lines to exclude from consideration exclude_lines = # Have to re-enable the standard pragma @@ -22,5 +27,5 @@ exclude_lines = ignore_errors = True -[html] -directory = coverage_html \ No newline at end of file +[coverage:html] +directory = coverage_html From 691c73d5569834d82c7e1df03e74bbdbc089ade3 Mon Sep 17 00:00:00 2001 From: Ryan P Kilby Date: Tue, 21 Aug 2018 21:18:41 -0700 Subject: [PATCH 14/15] Update .gitignore from GH --- .gitignore | 77 +++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 62 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 7d8d699..894a44c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,26 +1,35 @@ # Byte-compiled / optimized / DLL files __pycache__/ *.py[cod] +*$py.class # C extensions *.so # Distribution / packaging .Python -env/ -bin/ build/ develop-eggs/ dist/ +downloads/ eggs/ +.eggs/ lib/ lib64/ parts/ sdist/ var/ +wheels/ *.egg-info/ .installed.cfg *.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec # Installer logs pip-log.txt @@ -30,28 +39,66 @@ pip-delete-this-directory.txt htmlcov/ .tox/ .coverage +.coverage.* .cache nosetests.xml coverage.xml -coverage_html +*.cover +.hypothesis/ +.pytest_cache/ -# Mr Developer -.mr.developer.cfg -.project -.pydevproject - -# Rope -.ropeproject +# Translations +*.mo +*.pot # Django stuff: *.log -*.pot +local_settings.py +db.sqlite3 + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy # Sphinx documentation docs/_build/ -.DS_Store -db.sqlite3 +# PyBuilder +target/ -# IntelliJ IDE files -.idea +# Jupyter Notebook +.ipynb_checkpoints + +# pyenv +.python-version + +# celery beat schedule file +celerybeat-schedule + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ From 4b07c3ca92d64927d0b8ea454bc44ef0d9691000 Mon Sep 17 00:00:00 2001 From: Ryan P Kilby Date: Tue, 21 Aug 2018 21:29:15 -0700 Subject: [PATCH 15/15] Add wheel & metdata config --- setup.cfg | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/setup.cfg b/setup.cfg index 3ba7986..8d915a7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,3 +1,11 @@ +[bdist_wheel] +universal = 1 + + +[metadata] +license_file = LICENSE + + [flake8] max-line-length = 120 exclude = docs/*,demo/*