From 17897bb7b24f00ca4f93dc5a5167473d3e51bbe6 Mon Sep 17 00:00:00 2001 From: Derek DeJonghe Date: Fri, 25 May 2018 14:14:29 -0400 Subject: [PATCH] small tweeks to use bumpconfig --- .gitignore | 106 +++++++++++++++++++++ semver/__init__.py | 23 ++--- semver/__pycache__/__init__.cpython-36.pyc | Bin 3312 -> 0 bytes 3 files changed, 116 insertions(+), 13 deletions(-) delete mode 100644 semver/__pycache__/__init__.cpython-36.pyc diff --git a/.gitignore b/.gitignore index 2f666e2..8e62a02 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,109 @@ *.orig *.DS_Store dist/ +*.swp +*.pyc +*.zip +env +# Byte-compiled / optimized / DLL files +tests/ +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +env/ +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +*.egg-info/ +.installed.cfg +*.egg + +# 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 +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +.hypothesis/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# pyenv +.python-version + +# celery beat schedule file +celerybeat-schedule + +# SageMath parsed files +*.sage.py + +# dotenv +.env + +# virtualenv +.venv +venv/ +ENV/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ diff --git a/semver/__init__.py b/semver/__init__.py index 91f209b..bb744b0 100644 --- a/semver/__init__.py +++ b/semver/__init__.py @@ -18,20 +18,17 @@ class SemVer(object): self.main_branch = None self.version_type = None - self.main_branches = ['develop', 'env-test', 'env-stage', 'env-prod'] - self.major_branches = [] - self.minor_branches = ['feature', 'RightBrain-Networks/feature'] - self.patch_branches = ['hotfix', 'bugfix'] + self.main_branches = self._setting_to_array('main_branches') + self.major_branches = self._setting_to_array('major_branches') + self.minor_branches = self._setting_to_array('minor_branches') + self.patch_branches = self._setting_to_array('patch_branches') - #def _setting_to_array(self, setting): - # config = ConfigParser() - # config.read('./.bumpversion.cfg') - # value = config.get('semver', setting) - # print(str(value)) - - #return value.split(',') + def _setting_to_array(self, setting): + config = ConfigParser() + config.read('./.bumpversion.cfg') + value = config.get('semver', setting) # filter() removes empty string which is what we get if setting is blank - #return [v.strip() for v in value.split(',')] + return list(filter(bool, [v.strip() for v in value.split(',')])) # based on commit message see what branches are involved in the merge @@ -62,6 +59,7 @@ class SemVer(object): # based on branches involved see what type of versioning should be done def get_version_type(self): + print("Merged branch is "+self.merged_branch) for prefix in self.major_branches: if self.merged_branch.startswith(prefix + '/'): self.version_type = 'major' @@ -113,7 +111,6 @@ class SemVer(object): # 3) see what type of versioning we should do # 4) version the repo def run(self): - print(self.main_branches) if not self.get_branches(): raise Exception('No merge found') if self.main_branch not in self.main_branches: diff --git a/semver/__pycache__/__init__.cpython-36.pyc b/semver/__pycache__/__init__.cpython-36.pyc deleted file mode 100644 index 1ca636ab5aa29baecaefbaee39926200d286da9e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3312 zcmahLU31&U@$T?RilS&aby8<0#dtc6kPNBVPN#0Bb>up#>j$xJ<;E#v4+i8NDbOSU zAC8iRp*pSU*ZhP2f&PO27rgdKf1nR}=ydl0Qj|xN0E4}|-Mz!!e&5~PtpEF_^KH6K z$bZP%a}DNu@MUiSaKh6mgl@7)oyx7{MtE4Lb^UJ z8V{3r7>%BUG7~blZg)QG{BnTA<-=gI2Vd3&AV`mL(qqCHo189a&*F?5@MF6a=Ry$f z@*3c4yv{dZtn&ungmHs6`4)@~-U2bM751T+ehokV;y}oe@OJt#j0Z>abT*lIQoNdp zO!?l&U+#21^*{d7+lgY8%!e|W`rgjB&rf#SFFy4L6a>QuM-#q>@MZS_a55)B2|;R@ zGfq)nZjMY?86(7j8o51UFtfPBT|KioK_zuTTyZQWNjep=%3Tp3w-rc~*Kn4pa3o4( zDihvwh9XomDe@2h9F30D?_?Oo?XFNKiF}#uR>Yotl&E3!x@Y%iBN%~w4#Ht%}h*&|01#h%K85G z?q9&<*{%xXXb|qAn7iRjCGAX1;kUch5Cl;isUYa2r-i#*v{1!O0EF83vL?Vf&9_Q( zc9wiA+c>~#!KZEWKbR;orlmDT2Fw}y&v(Wdt?=N^U<-4N!jv(mV{>dR$bz03b5_pB zHm||joSS23LC!4Y^7`C*A9yHOcU&9S=LXR2xh?+-v<<|=N%nYyHx}T*a|^=dpL)Fs zD-tx~#*&Jwxdm_&b~ZJ3YeCDi0n=LUT4Anf%=Q}3_2pR=51g{V0DP}o7^6rP#v~c# ztbMzn9iJ6;rg$;~?BImwH7SnUDaK{qXt%?DAJk zyeRW}&NLjTBaxkBD4b*T=FUhav-GxijuBF=?s(PYu6J%+pg;Hgt)iaI`ry(7k!6MT zBuPbFm`@%**)NPtNeS7F6s8m*FKjLb2^WPefe@vIl}d=vV*Anl)8OGB4-Otb4G#7X z4<9_*hpUND4vq>-%OX)Yi4IYi{Un+Aj@-ZnO$*vDoGJVnf~#PCS=d!vz`ekmMW&s% z1e>^}F%oL!+GXB?^K-Dm7LEx zdS7|w^Jj$H;5knBd%9a#I`*H!h%w)@bg2K{x1|eGYVCp*RVY<<5~(9;BesU14!~!n zw(S($DSG{`Mq8+h^~Cc4_GC8!5YS=^w1@h2ZDUC0(vEz&$wYA_HJP#w`3D zTg5*s<9~^T$Y)s2=4D=%Td=>d2fB3S^%>-`j)3Gi$#2}MelFx*nZP=OWO_?t3HGVH z4ntnk{BbxH`FpoO>@Zf*!27z)v_jtU4fz4^$)Dm+%#$!umBQrD5sk@n&HtL2P_s0E zU=HxyKLItv^hj7;dt3=!n*XHI&}IHh`dRs!2m4F?fS0im!>Wba0X-NiJ(y6R`moGs?tc2CNF?FLr)?QEH1pOFj<-wxh{#mGVLDhy4ti$Bd$@M z3&Ss|+Qe?RG_je^vZKOIWHgFmXfDcXynfT%ZnvQjXX{3jKX%zI@QEoHER1=8f8Zc< zS%4X?~+J**om3i(@{;9HFaPPhT9fLREXfW3!vez&_~>W($b=F@5RC4&YdY zgKC!Dhc(nF&109=#agE8mu}*;O3ZHF>?WRW7QA6Hi+TQ0H&Gf9#Ul?}BQNx@MX1U_ z{sHiVUwXqyaQ`CAJ${*sFw-zeegsXzCf(2Z_ZE<<>#zvby2ka6fcgZo_rlmZlDXsvk5b zhORazHjt-HMHXn#vXlPAB#J?2evgtfz~oJ6By^+k40>zm(*gT8@=e*JW1^y6h(r8; zDIF#~t#|0es8|zL*D(_<_YYtx1CKJSTvYA>1{H?XAn@z*w|ENXr=n5jKiwioiGEmY zJf5bBRQpmUvT&+kh4|@@#Xyy!?BV_|5L}_H!u?HYkNc<#o%7Lv3?yl?ZDz98v1`Mc I)TvGW4>@)NA^-pY