From 648d450feeb3aac4e18fcb2a183941803609171b Mon Sep 17 00:00:00 2001 From: Neido Date: Fri, 26 May 2023 20:52:04 +0200 Subject: [PATCH] Fixed Icon --- README.md | 4 ++-- pyproject.toml | 7 +++++-- src/cgol/game.py | 3 ++- src/cgol/icon.png | Bin 0 -> 6162 bytes src/img/icon.png | Bin 2240 -> 0 bytes 5 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 src/cgol/icon.png delete mode 100644 src/img/icon.png diff --git a/README.md b/README.md index 34d3efb..c161ad0 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,9 @@ A Conway's Game of Life implementation using numpy and pygame. ## Description -This project has no particular aim. It is a purely a personal project and barely maintained. +This project has no particular aim. It is a purely personal project and barely maintained. -It is a CLI based [Conway's Game of Life](https://en.wikipedia.org/wiki/Conway%27s_Game_of_Life): implementation using numpy for fast calculations and pygame for an interactive simulation. +It is a CLI based [Conway's Game of Life](https://en.wikipedia.org/wiki/Conway%27s_Game_of_Life) implementation using numpy for fast calculations and pygame for an interactive simulation. No Hashlife or Quicklife algorithm support (yet). diff --git a/pyproject.toml b/pyproject.toml index 460f88e..cd81af8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "CGOL" -version = "0.9.3" +version = "0.9.4" description = "A whack Conway's Game of Life implementation." readme = "README.md" requires-python = ">=3" @@ -35,4 +35,7 @@ Repository = "https://github.com/INeido/CGOL/" Issues = "https://github.com/INeido/CGOL/issues" [project.scripts] -cgol = "cgol.__main__:main" \ No newline at end of file +cgol = "cgol.__main__:main" + +[tool.setuptools.package-data] +cgol = ["icon.png"] diff --git a/src/cgol/game.py b/src/cgol/game.py index 252ecda..7d0f2d3 100644 --- a/src/cgol/game.py +++ b/src/cgol/game.py @@ -14,6 +14,7 @@ from .world import * from .utils import * from .parser import * +import pkg_resources import pygame import numpy @@ -78,7 +79,7 @@ def setup_pygame(self, rw, rh) -> None: """ pygame.init() pygame.display.set_caption("CGOL", "CGOL") - icon = pygame.image.load('src/img/icon.png') + icon = pygame.image.load(pkg_resources.resource_filename("cgol", "icon.png")) pygame.display.set_icon(icon) self.dis = pygame.display.set_mode((rw, rh), pygame.RESIZABLE, 8,) self.clock = pygame.time.Clock() diff --git a/src/cgol/icon.png b/src/cgol/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..88aa5efc7bea5f7c5ae269ca228406d8444c4f38 GIT binary patch literal 6162 zcmeHKd0Z2B7N1lUrD_omT;)^8SXWV#OzuM>C_zXu$RY};SSFJROhXQnfdteBZ0ohV zo~zpx@K~#KwVqV0qJmfL>Izn+idvvvxPnCi6-Z$En*1<71%~qvb?UpH<{t_+f2rX1z5i(bC$l`)cqp^( zthNZkRvj<(`s?y^UWl|wku`8<%LDF}0ozQ$d1KGDHYSXjzT?8ku-X$>Vzw+9TOH$F zuxaY0YRqG8KabRpCkH*!otjM+%t4KFKW*-nqqw}+zCnDgd{s?gf&o@wLGz)8k25|D z;b}FGQ}@S|O3+1RlUnZ+%)<;50?eDmwYPmVsh{nPlMq#6IvK6(#Q9XK~-jQ^dw9qQV#la{ELXk)eO zxTBOrHQKa6>W-3#w(G|4>r=Wbe(dA~GuZrma@z{y!oPW%`yarRArI+;@W3rLR58=-W5*p%1>>akyZ2 zfsy+DE60;=303Bef8JUW530^afa;1>O_5Cv|gGFYO zGhMhc@SPTOn6S%))XAB#sz^B4XvSdyTfjzGAvPkF$DH5=2beWlS(IXO8w9wLGm}Wt zB;#~Xa(8Evt)0p2~FSjdo60Mh2rb9Y#xL6dT#aEmd; zjNu`vxPcte5kiBt?>D8GlU?CxFbw&2SoXYKVWT;XV*}j9OAd%3UT)P0-oh(U0 z`;4qkzR?<2I2|1U+uLzFSwD^4WeluTDw)EFrO@sv6>=thzD#4p2#w736+t8#F;A*t z2?dy#CBSe2ON#TjEU^&RVj^6?)r!y#P)dV^L=6~DLjiC$0dTlNRD>dYAxk5YqAUSd z%x9@ZY6*+W7YW6P7#E;iNe76jW&%_tn%vPV8cGA8FdWBuQhhYVx&^e zaLGX|vS2fgl16j1(U>e}(k{XD&UUp5w37xUQ3Xok02JZzWr$G56Gih78CN0`B4ZJr z4C!ER)DYUVU$ds02M%zjJdCh_^V3`+cSlXb=en=lm&t^ym0;M_6fzWZhhRZdagEDQ zfaO+UNvI(a2h*diT%XE`=ahmP(;%oC*Rli>9F&5XD`BY-M8raHo=7S{r5K94^Vg1U zF=|OGYQ`rf0v-WZpgdh%!J}P?^6%`6H3_G)00?6tLe?|FxNU@S+5+a#GvjH*0i6Hg zB*10RVaR}eZW$O}U>0)PhhZCMz~49dYRko&JOYNh4tXVhyXfko>y;RICF8E@>Z0qF z7T=<<5@IE5R)uOKUUSkl<$tO5^OJ=Ec$3W%crHXX@b10=mnVR04+db>aU zWsrVV+SS$|1%rX8AbeeUHux149M_iWBL=1l)q znw-_&n;cl)ax>cDj4xXV!A11SfVzPNz15puJrR1j6|bi&s_R|qn~**8@7eY%`3LKo zKPc|IxoX(q%!YD%>gJ&xj(N`c?JoRQU6JRIs#r3cZ2=k#Z=wM z@zf*XcaG=IHVSe{&PvF%{&J2g1lc-KC{UV9a(T)30 z*OQATb}uQJXtB)Dm&)lsu51kzP1xKB9Zt~jsd!a7& zZ^K)aTScb8C9M6S^+#rmSC(O6BH6lr`PdPz8(^^oN^T@cF`&{C_&o_rLX3WY5j> zh&vshwWj`Z^$pL;;y;9~ug!A=-Y3r#4;$qO{O=i`7x(w?;{RE`U%oz~HRG(*+5JLd zRiM1IJY&U*vL>2At99oNCv~yJp7*Z>tw*RIG8miu+)ehf8hQ=gglpc^TX%JV8Cko_ znjDL3ocDJI$ChcQ&7*Ql3ZE3d`KdE>JEy2g9zd~bZkyNBWpuySVFEVRk0@wuiF82ouU#&;6N~k9c~|7s z7gD>9P#0S)px@nz={Ws5b?<9r1z-+J8l3xm+@kD{zG$I1iSvr;-zg7DuPWR}Qg5Dz zAs{F28{zDEExXefpRdoo=P+i^tm@JEcIR$~wqAbO6m{PtfBhb{XEX&>zqjnc$k1JW Pbb~8HA{4tOB`o|IR>0%& literal 0 HcmV?d00001 diff --git a/src/img/icon.png b/src/img/icon.png deleted file mode 100644 index 345b9d0a259e982801ad98341c3cbc2b9347db4a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2240 zcmchYZ%7ki9LI0cA8}Yx5M{Pi5EfL+i1JVEP>fR3nMD7nEfaQXY*yBp%62xe6$HMC zLa?0`mS8w-HOn)XN=W3kV3BNcu7)L}-KlN!YUk~GCK0}?H{JseKc45+_xU~F@8@@` zxad$~LUIBGL5X>Xb4wsd^f|WU$X7%iZ|xvW*@uOLVeQYw;*e8d~q!QRW@Qu ziEGT?Q}C|j*`3=1IoVeVD}2(KN9*I)WWKI-ZW``xxS%!8Oq}A-39SraaFv>ABH4~M zSvm3QWW-<%SE5)CPU2Q&1cLNMt)hoZk~iirdZ{ErBBO^wn5vy>=E(tghi<^EiLk0F za4O_^NtUdMNxWX^? zDCIKUKq*bDnHtv3l}#>9Oxp4RIvOWH0ZjS-H8=Hd@jU|LqrN(g{rlNHRlxq8W`t46 zowQkQrxjk9<8a(bEBI)5QZbkBwxK{)Kwt1negGzNvG zozkIyqlF2WGQ;Y5_*P7r@AkJ+-_HBRD}tePf@g6c@iFTcFd<1VNa~*afyQz+Vi?-L za6UD046NzJl>$X|o(W@ZE7L!MAr%e22Y3yu{bIeQpC1L2l8#L+K}i-BNwTkoGJL+; P7(((67Ug#4oHP6e2#X$R