From 781ce85f98379394195c5f5f787492beecda8369 Mon Sep 17 00:00:00 2001 From: Denis K Date: Mon, 21 Sep 2015 16:00:58 +0300 Subject: [PATCH 01/12] Fix dashboard application templates not being loaded --- CHANGELOG.rst | 5 +++++ MANIFEST.in | 2 ++ 2 files changed, 7 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 3cb038f8..6ee12e13 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,11 @@ Changelog ========= +0.1.0 +----- +* [Fix] Issue-9: Fixed dashboard application templates not being loaded because of bad manifest (thanks to blueicefield for the report) + + 0.0.9 ----- * [Feature] Replace sidemenu scrollbars with Mac-like ones diff --git a/MANIFEST.in b/MANIFEST.in index 50c75ad5..3b1d31a9 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -3,3 +3,5 @@ include LICENSE recursive-include jet/locale * recursive-include jet/static * recursive-include jet/templates * +recursive-include jet/dashboard/static * +recursive-include jet/dashboard/templates * From b9a470e7e879c491013d784221249841b3888577 Mon Sep 17 00:00:00 2001 From: Denis K Date: Mon, 21 Sep 2015 16:02:11 +0300 Subject: [PATCH 02/12] Expand non dashboard sidebar width --- jet/static/jet/css/_content.scss | 2 +- jet/static/jet/css/themes/default/base.css | 2 +- jet/static/jet/css/themes/green/base.css | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jet/static/jet/css/_content.scss b/jet/static/jet/css/_content.scss index 3bf5d871..0b06f7bf 100644 --- a/jet/static/jet/css/_content.scss +++ b/jet/static/jet/css/_content.scss @@ -78,7 +78,7 @@ ul.object-tools { .content-sidebar { float: right; - width: 18em; + width: 24em; margin: 0 20px; } diff --git a/jet/static/jet/css/themes/default/base.css b/jet/static/jet/css/themes/default/base.css index 248779b9..f9811740 100644 --- a/jet/static/jet/css/themes/default/base.css +++ b/jet/static/jet/css/themes/default/base.css @@ -4650,7 +4650,7 @@ ul.object-tools { .content-sidebar { float: right; - width: 18em; + width: 24em; margin: 0 20px; } .dashboard .module table td a { diff --git a/jet/static/jet/css/themes/green/base.css b/jet/static/jet/css/themes/green/base.css index f1f558c3..9b91f2fa 100644 --- a/jet/static/jet/css/themes/green/base.css +++ b/jet/static/jet/css/themes/green/base.css @@ -4681,7 +4681,7 @@ ul.object-tools { .content-sidebar { float: right; - width: 18em; + width: 24em; margin: 0 20px; } .dashboard .module table td a { From 073906ebb85c7d6d6be186a22288082a7421eb82 Mon Sep 17 00:00:00 2001 From: Denis K Date: Mon, 21 Sep 2015 16:03:25 +0300 Subject: [PATCH 03/12] Remove unused imports --- jet/dashboard/dashboard.py | 2 +- jet/models.py | 3 --- jet/utils.py | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/jet/dashboard/dashboard.py b/jet/dashboard/dashboard.py index f78c6980..5666c0ec 100644 --- a/jet/dashboard/dashboard.py +++ b/jet/dashboard/dashboard.py @@ -1,5 +1,5 @@ from importlib import import_module -from django.core.urlresolvers import resolve, reverse +from django.core.urlresolvers import reverse from django.template.loader import render_to_string from jet.dashboard import modules from jet.dashboard.models import UserDashboardModule diff --git a/jet/models.py b/jet/models.py index c61fe77d..8fe97564 100644 --- a/jet/models.py +++ b/jet/models.py @@ -1,10 +1,7 @@ -from importlib import import_module -import json from django.db import models from django.utils import timezone from django.utils.encoding import python_2_unicode_compatible from django.utils.translation import ugettext_lazy as _ -from jet.utils import LazyDateTimeEncoder @python_2_unicode_compatible diff --git a/jet/utils.py b/jet/utils.py index c21a5d38..2ec73aef 100644 --- a/jet/utils.py +++ b/jet/utils.py @@ -1,5 +1,4 @@ import datetime -from importlib import import_module import json from django.core.serializers.json import DjangoJSONEncoder from django.http import HttpResponse From e59d3f271de779fe48b5dbf1880001e43647caf7 Mon Sep 17 00:00:00 2001 From: Denis K Date: Mon, 21 Sep 2015 16:05:06 +0300 Subject: [PATCH 04/12] Add missing localization for django 1.6 --- jet/locale/ru/LC_MESSAGES/django.mo | Bin 7341 -> 7526 bytes jet/locale/ru/LC_MESSAGES/django.po | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jet/locale/ru/LC_MESSAGES/django.mo b/jet/locale/ru/LC_MESSAGES/django.mo index ac0fab6fe9d7e04b13b270a12bc9a9f86bea0050..8784b0b3d41fec42626fcc4a2588c2a1e4cea3dc 100644 GIT binary patch delta 2092 zcmYk-e`wTo9LMp`yt(U~H+8iw)4A`=wx*lTnXS#Orq*n(ZQ3-u48zGWbRu?Xti zNf4g3Wy{>kmgIJzsYpp$~rU@%end-|y%1 z{`{Jw4c8lE(}lSo8`4hlV)9?JjEUiu+5C_$`;B=Lr?5f|4;b?xRAL^k!@0Nt3$P0d zaTm_VH|+B`E~h?>k7F7i)lk1v2-4sWWIHZGbzFr!GPTIqrop-%=TUD%eHX%|*ozP0 z5mW%5+UI9c{airxGldR%Sf;7ou?>ZDvNKtOntTf?kXBpoz z9YO_=Kz%=gxp*4Y?-#cH49?e5f29ImM$PPJRHQet7jI)2LyX>m-(ouk8C?N|P%{jp zw%{OYW!|y%gsmS(z4tjPpfQYTpmP)!;CWQtMMZkmI*mT+*KGX;YR0#0{VuBGd#D-v z8C_dafMvKEm*7?`#n)~9!yxNlL&GQy<@gJ#YA& zZK%K_)_(i^O;lj-q9*trj^`NjK>_O@pK?` zCr|^A;j{PyZoqt^ZN^Sqfk&|pCy=?BKTx-5CT0skY6NAlxpyqVNRv zB8y>8AlqnCr~xn8=RcwX46r}yXelbNwW#+tqh`DVIoz3j*K-}X9b~0#Su$I!qQ*BX z$=xcD6vzviQuaqHp|m-RnPnB4)&0~=VKupiTt%)Uvk;lR=LndW$x6>;$s9h4yE1#Y z$~L};P2?7`?zQgf7V;XhZh`Ln|I;Qax^7BZu}1P!WbL=MW@GYH-lCk^e?zDP^I?dOkP=_o|4veYqH#55^ANS)ovhjA~JuOwVgZ3_mj42wa<=G*3 z(mSjcZ^#>V+%&CT!X4xNL*C)!RME=dh&$#T;mb5{C6XT%Z%Q>4H~5N2=rGMoiA;Ci QkbB1c+KZ3+0~jm#zyJUM delta 1910 zcmYk-duYvJ9LMqRc4l+fI2+D3+ni%#%w?F%ZVYpq%h={V;SViaVaX85k<_HbI<1D~ z@&{oN&Xg!3e@U``hQc3&{6R{&llSL%#MAli^*q1p_xV20IeT4lp*ZwBC9c(ID~L?u zX{=cY+k5bb)|Oy436EedKE!_b8RM~cPqRc!!9Ezk6wF5-PIu>Pa0KJEI2;dPj$Rd^ zlf;2Xs0Y77J@_l~G4q=7F7rB*u`lCv)O~rFjfL1BYf%X_y7PNc&pC{G&JhgaDGX?; zcie#&sF`?rnQ8JqR3d&i&cfb|bC8dX;g7B_L2k7<&T3Qwt5ElE!Z_TDdhSkld=L6m z>Sj8cQ5&wuvsi~d-d2g*a6aBeKIY@Cno%aI)FnBd0cZd{GJZY?T-dQ=5AVlr;U zkPbA{QD%pnt>|HV%#BYtPoo~#ftpz-s`NK7fX{Id{=zKGA}ftcaWvNAVBC+Y*!d*t zuTCciQt>9LblvWPx2ViNqF($3wZ<__TM7G}nW*#GsKiF1CRTt~V^|_=VElnH&%#=E zCY#Srs{SNvcR8TUx==Iv=*E8PG?Z}>>cwktCT_uUyoOWoJC4L+vM<0oBv)%gZR#`5 z>qsv409CPPAvzg!e&P^J=W1Do18^Pc{0<~1Yelw)oxzEC8OP!qH%=o1gJkP#LB1)^sewfmnln+=!~wK4**bIBJbMP!+g`NAVMOU<)^I zz$vWnc07-oP&V07iIA1i(OOiZ64;DEY(XV*1@+?lNRIXdRl@g}i$9U#*$^()3=2`` zD^QzwIdX}uLS5H{dQLMY>igeLXA}p{;Rx);X&A%wOR*d^-i;M_3+G}_rlAMcpk7>u zg}4nT;6+sBULvbw-%u0j!_TbFXJ8udw<Y+@Tv=)5-85<;!| z57D)B-6&OVP=HGIZ=?FrHpdx?bsaJLzkVtGF~n#hj~GiZahpuAw6>H`)9zQ(CQ}O% z`RdRX5hX+!p|7XDl9j|bLYqA9-=&ObGl^;H&{Q%t{qxZ}YiXv3yW%rqio);W16hk1 zFCf&)iDE( Date: Mon, 21 Sep 2015 16:06:05 +0300 Subject: [PATCH 05/12] Add importlib requirement for python 2.6 --- setup.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 94651409..794f69ef 100644 --- a/setup.py +++ b/setup.py @@ -5,6 +5,15 @@ def read(fname): return open(os.path.join(os.path.dirname(__file__), fname)).read() + +def get_install_requires(): + install_requires = [] + try: + import importlib + except ImportError: + install_requires.append('importlib') + return install_requires + setup( name='django-jet', version=__import__('jet').VERSION, @@ -34,5 +43,6 @@ def read(fname): 'Topic :: Software Development :: User Interfaces', ], zip_safe=False, - include_package_data=True + include_package_data=True, + install_requires=get_install_requires() ) From a2308b11e66e368e71084328a147ec868c2af728 Mon Sep 17 00:00:00 2001 From: Denis K Date: Mon, 21 Sep 2015 16:07:23 +0300 Subject: [PATCH 06/12] Trying to remove travis condition --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7738cb8c..96ea11b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,6 @@ env: before_install: - export DJANGO_SETTINGS_MODULE=jet.tests.settings install: - - if [[ $TRAVIS_PYTHON_VERSION == 2.6 ]]; then pip install importlib; fi - pip install -q Django==$DJANGO --use-mirrors - pip install . --use-mirrors - pip install coveralls From 9d810be870e37bde453e06b9d7c878c1edc36aef Mon Sep 17 00:00:00 2001 From: Denis K Date: Mon, 21 Sep 2015 16:11:51 +0300 Subject: [PATCH 07/12] Add python 2.6 test --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 96ea11b5..8260a1d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,8 +23,6 @@ after_success: - coveralls matrix: exclude: - - python: 2.6 - env: DJANGO=1.6.11 - python: 2.6 env: DJANGO=1.7.7 - python: 2.6 From de9f1c26b24ef48715766dd7031ea581dcdaf0dc Mon Sep 17 00:00:00 2001 From: Denis K Date: Mon, 21 Sep 2015 16:18:59 +0300 Subject: [PATCH 08/12] Specify coveralls version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8260a1d2..6ffa78bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ before_install: install: - pip install -q Django==$DJANGO --use-mirrors - pip install . --use-mirrors - - pip install coveralls + - pip install coveralls==1.0b1 script: - coverage run --source=jet --omit=*/migrations/*,*/south_migrations/*,*/tests/* manage.py test jet after_success: From 2d337e83aacfae201739e9f143a306fef3664467 Mon Sep 17 00:00:00 2001 From: Denis K Date: Mon, 21 Sep 2015 16:31:40 +0300 Subject: [PATCH 09/12] Specify coverage version --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 6ffa78bd..35bb333a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,7 @@ before_install: install: - pip install -q Django==$DJANGO --use-mirrors - pip install . --use-mirrors + - pip install coverage==4.0b3 - pip install coveralls==1.0b1 script: - coverage run --source=jet --omit=*/migrations/*,*/south_migrations/*,*/tests/* manage.py test jet From c5e2944500224decdf9f2a706b853cd870023120 Mon Sep 17 00:00:00 2001 From: Denis K Date: Mon, 21 Sep 2015 16:37:21 +0300 Subject: [PATCH 10/12] Update versions to previously used --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 35bb333a..4950b091 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,8 +15,8 @@ before_install: install: - pip install -q Django==$DJANGO --use-mirrors - pip install . --use-mirrors - - pip install coverage==4.0b3 - - pip install coveralls==1.0b1 + - pip install coverage==3.7.1 + - pip install coveralls==0.5 script: - coverage run --source=jet --omit=*/migrations/*,*/south_migrations/*,*/tests/* manage.py test jet after_success: From b6804b9c88c243a5c1744f2a76edf925768a64e2 Mon Sep 17 00:00:00 2001 From: Denis K Date: Mon, 21 Sep 2015 16:44:25 +0300 Subject: [PATCH 11/12] Update changelog --- CHANGELOG.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 6ee12e13..fca32b2a 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,6 +4,11 @@ Changelog 0.1.0 ----- * [Fix] Issue-9: Fixed dashboard application templates not being loaded because of bad manifest (thanks to blueicefield for the report) +* [Fix] Added missing localization for django 1.6 +* [Fix] Added importlib requirement for python 2.6 +* [Fix] Added python 2.6 test +* [Fix] Fixed coveralls 1.0 failing for python 3.2 +* [Improvement] Expand non dashboard sidebar width 0.0.9 From c2e211a40bd150016ddd33e9076ae864484b8109 Mon Sep 17 00:00:00 2001 From: Denis K Date: Mon, 21 Sep 2015 16:45:45 +0300 Subject: [PATCH 12/12] Update version --- jet/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jet/__init__.py b/jet/__init__.py index 1e8e1e67..1f6518e6 100644 --- a/jet/__init__.py +++ b/jet/__init__.py @@ -1 +1 @@ -VERSION = '0.0.9' +VERSION = '0.1.0'