small tweeks to use bumpconfig
This commit is contained in:
		
							
								
								
									
										106
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										106
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							@ -2,3 +2,109 @@
 | 
				
			|||||||
*.orig
 | 
					*.orig
 | 
				
			||||||
*.DS_Store
 | 
					*.DS_Store
 | 
				
			||||||
dist/
 | 
					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/
 | 
				
			||||||
 | 
				
			|||||||
@ -18,20 +18,17 @@ class SemVer(object):
 | 
				
			|||||||
        self.main_branch = None
 | 
					        self.main_branch = None
 | 
				
			||||||
        self.version_type = None
 | 
					        self.version_type = None
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        self.main_branches = ['develop', 'env-test', 'env-stage', 'env-prod']
 | 
					        self.main_branches = self._setting_to_array('main_branches')
 | 
				
			||||||
        self.major_branches = []
 | 
					        self.major_branches = self._setting_to_array('major_branches')
 | 
				
			||||||
        self.minor_branches = ['feature', 'RightBrain-Networks/feature']
 | 
					        self.minor_branches = self._setting_to_array('minor_branches')
 | 
				
			||||||
        self.patch_branches = ['hotfix', 'bugfix']
 | 
					        self.patch_branches = self._setting_to_array('patch_branches')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    #def _setting_to_array(self, setting):
 | 
					    def _setting_to_array(self, setting):
 | 
				
			||||||
     #   config = ConfigParser()
 | 
					        config = ConfigParser()
 | 
				
			||||||
     #   config.read('./.bumpversion.cfg')
 | 
					        config.read('./.bumpversion.cfg')
 | 
				
			||||||
     #   value = config.get('semver', setting)
 | 
					        value = config.get('semver', setting)
 | 
				
			||||||
     #   print(str(value))
 | 
					 | 
				
			||||||
        
 | 
					 | 
				
			||||||
        #return value.split(',')
 | 
					 | 
				
			||||||
        # filter() removes empty string which is what we get if setting is blank
 | 
					        # 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
 | 
					    # 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
 | 
					    # based on branches involved see what type of versioning should be done
 | 
				
			||||||
    def get_version_type(self):
 | 
					    def get_version_type(self):
 | 
				
			||||||
 | 
					        print("Merged branch is "+self.merged_branch)
 | 
				
			||||||
        for prefix in self.major_branches:
 | 
					        for prefix in self.major_branches:
 | 
				
			||||||
            if self.merged_branch.startswith(prefix + '/'):
 | 
					            if self.merged_branch.startswith(prefix + '/'):
 | 
				
			||||||
                self.version_type = 'major'
 | 
					                self.version_type = 'major'
 | 
				
			||||||
@ -113,7 +111,6 @@ class SemVer(object):
 | 
				
			|||||||
    # 3) see what type of versioning we should do
 | 
					    # 3) see what type of versioning we should do
 | 
				
			||||||
    # 4) version the repo
 | 
					    # 4) version the repo
 | 
				
			||||||
    def run(self):
 | 
					    def run(self):
 | 
				
			||||||
        print(self.main_branches)
 | 
					 | 
				
			||||||
        if not self.get_branches():
 | 
					        if not self.get_branches():
 | 
				
			||||||
            raise Exception('No merge found')
 | 
					            raise Exception('No merge found')
 | 
				
			||||||
        if self.main_branch not in self.main_branches:
 | 
					        if self.main_branch not in self.main_branches:
 | 
				
			||||||
 | 
				
			|||||||
										
											Binary file not shown.
										
									
								
							
		Reference in New Issue
	
	Block a user