From 9f2db442e39c82da0249fbf81ef8f19d712f6e64 Mon Sep 17 00:00:00 2001 From: Zac Deziel Date: Tue, 7 Jan 2025 13:35:09 -0800 Subject: [PATCH] Debug adding provider (wip) --- .coverage | Bin 53248 -> 53248 bytes .python.env | 2 +- .vscode/settings.json | 9 ++++++++- Map.py | 4 ++-- provider.py | 1 + pytest.ini | 3 --- requirements-dev.txt | 1 + symbology-style.db | Bin 0 -> 86016 bytes test/test_map.py | 19 ++++++++++--------- 9 files changed, 23 insertions(+), 16 deletions(-) delete mode 100644 pytest.ini create mode 100644 symbology-style.db diff --git a/.coverage b/.coverage index c4810d5b8882ebb77d4831e7d4d8329fe589de5a..4488a1f40f99e10dbd3530b5ac69c411d0b63980 100644 GIT binary patch delta 901 zcmZXSPfSx;6vpp+@4oi+y?gILO6H$HYlP^+NMVGrAf+Z{VwG2niV;PWXdz7oC{QQC z1Zk5of<{bwUAd9fU^1g3#hnX{8>2Bo)XBIo#EoW>Q6T<{OybOWwYr(jJ@-4``QE#~ zo1320(v#Y>%Wt+3n1E3@0&TffMa>|CRes+O{y?yPQ%!wfGgr0M-k;-xLy7*r+Ktso zg_dR7&xsO#)w6;e4Ev|`vQOY0lao)&YvCAyUs;oupSL>klwK->w;ivbR zxv}j%iW&l$Yze7NLf&fKBz?A}H*k%N$N@WG9!n*D8rql~Zen@!u+0=p_S!Msq$Kk# zj?~K)o9mu}s`U=^B!&(p`cm=1?ye(oOg04`3S3!$}y1K71W}phUbz(0MWH<5cm4 zdBlAuH=%7fGuEjRl5XxMxRMKcC8-QC95}%u%H+R3ZQsME;%GEm8O?rLf2oLOE272Q za6DRUI3iQA#!s?-r%lqkw|@}a!hESkFJ1k8@7o5&W1=iEQ}Jii`5no11ZQNKdcf}&kcC+^og2-?2C=7i>G?a{(LqAKqeqb^l0pYxV;m?H2Gyn&bS q9PjE+n1{P?8*adLxB^pnPbZ<&IfTM_zA%Bi~i!mX(kris9pq7=AXi^tOH;|C%j<}I%#A4!OVPc$WP&a4J|4+_2|2Hxzk4(xB zRGaRRAPaqP2t1`4>ki;2TWmI$&AHF(a(G=XW|BA6=HuC+M0(KO>?{(58?F+5y`_JP z-QJhZ`*QK2T+?n_({E+Z#xv<`&UYb~N|t`MfOXp*3cd&2dR@( z$Q0=%8}xa7RGjVBOQS~ykSPfKQaGrz8L~9Y$3qVNaxRe^YR(k=jDPO%D;_FKh3bbT zbS@+80O8KgfGMDh$4#^8eByjOEBuhgS3ASV!ULfWWER!KpNG~dDwc{M#@*Z+W=P?U z;bUq${%fWp49Wac*u(nLgZ))7vFf0y>hRgfiS2X-o{<>2O*YarS=ATxG5Ue+f-A7s zFdHkzP4L3tsIBB* zdYxCIVWe??Z-+qe_j*P68iBFUN z$zP|dqODgK{b){RN_9ZN^YLJLsw}i2xAMyPdU3cc!4LQX XEAS4M;0-LmODK!OccE0i<#YT3-%i2O diff --git a/.python.env b/.python.env index 1ffaac3..def5263 100644 --- a/.python.env +++ b/.python.env @@ -1 +1 @@ -PYTHONPATH=${PYTHONPATH}:./extlibs +PYTHONPATH=${PYTHONPATH}:./extlibs:/Applications/QGIS-LTR.app/Contents/MacOS/lib/python3.9 diff --git a/.vscode/settings.json b/.vscode/settings.json index 041b62a..971f24a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,10 @@ { - "python.envFile": "${workspaceFolder}/.python.env" + "python.envFile": "${workspaceFolder}/.python.env", + "terminal.integrated.env.osx": { + "PYTHONPATH": "${PYTHONPATH}:./extlibs:/Applications/QGIS-LTR.app/Contents/MacOS/lib/python3.9" + }, + "python.testing.pytestEnabled": true, + "python.testing.pytestArgs": [ + "test" + ], } \ No newline at end of file diff --git a/Map.py b/Map.py index 167cbb8..1374ac8 100644 --- a/Map.py +++ b/Map.py @@ -27,9 +27,9 @@ def addLayer(eeObject, visParams=None, name=None, shown=True, opacity=1.0): >>> from ee_plugin import Map >>> Map.addLayer(.....) """ - from utils import add_or_update_ee_layer + from . import utils - add_or_update_ee_layer(eeObject, visParams, name, shown, opacity) + utils.add_or_update_ee_layer(eeObject, visParams, name, shown, opacity) def centerObject(feature, zoom=None): diff --git a/provider.py b/provider.py index 9d92705..7a6c7c3 100644 --- a/provider.py +++ b/provider.py @@ -58,6 +58,7 @@ def __init__(self, *args, **kwargs): # create WMS provider self.wms = QgsProviderRegistry.instance().createProvider("wms", *args, **kwargs) + assert self.wms, f"Failed to create WMS provider: {args}, {kwargs}" @classmethod def description(cls): diff --git a/pytest.ini b/pytest.ini deleted file mode 100644 index f44261f..0000000 --- a/pytest.ini +++ /dev/null @@ -1,3 +0,0 @@ -[pytest] -addopts = --cov=. --cov-report=term-missing -norecursedirs = extlibs diff --git a/requirements-dev.txt b/requirements-dev.txt index 4186c0b..33327aa 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -6,3 +6,4 @@ pytest==7.4.3 # pytest-qgis does not support pytest>=8 pytest-cov pytest-qgis==2.1.0 pre-commit +pyqt5 \ No newline at end of file diff --git a/symbology-style.db b/symbology-style.db new file mode 100644 index 0000000000000000000000000000000000000000..18c372e0ee50c9244ca4427d507d58a019667650 GIT binary patch literal 86016 zcmeI%O;6iM7{GD6r8apF1!N%>VYCMt6&0nNI8@!VwGdhgTQ+F7m8!@jhEh2sBxaSi zC*S&ID(!t$Y47`Ws%oXZtmBCtyU6M#r_nzW@pugL%=4R>gwg!^;^4w_%(LF0YkTI7 zQdLw{`N=dDMJWeA%fV0d8sE=FH^Eg+l(ULu<-yVWQsrM|Y5q^8@~ZMr`BP=H^j~>Y z+AaNEY!|;4{wh8!To-=Gf6l+keaU^yEeF5I3jqWWKmY**5J(8Lmvm!eL-iLt`_y%Y zU3=i24|>=AX=(ZCvDIi=X0!3+z%r-x_bxi-{$bPFvyRPQj`yE8j$fKTTQ9dR?XF`s zt>2qlqplkkYFCT8QLCx`nh5f)d)jk%I-Y&rwfn==-BLPO>e;>E4_b+!heu8G@Z{iN zD{3O~u=e(@Zmh4X{*Pfuw?7oo;=*DoP+XlE!*$M`%TC|++HZz$?7owX)mhMuwKdgW z6|tgFlk44dq)BadAp6vDhmPl6T%He;QS7RSvK&V7&O}1dbs-fcs?ChzIU`T}kD3he zx}qDatI=d=iwKiTH5Fh|nc053=k^8zyW3AT|65r%R#sF$Co%|!U&N@S8W(k$ZHwVf zHvFul8H6DizdK!P*98ImC~PL0RMEAVYA~w(ZmZ_W;r@#gD_#p*XZ9bx z!FY=>Sv$4uqGmi@Qx5bC#BZfkKM4dVl{~OTd8h}x*7EG{w>XTypq*N z5hhxew}Y?L`SI6kY5Z0lzwtr<0R#|0009ILKmY**5I_I{Sq1Xr#MuAKI=tkC00Iag zfB*srAb=KmY**5I_I{ z1Q0*~0R#|`Ux4#}`Nx90tg_000IagfB*srAbmAp!^>fB*srAb