Merge branch 'hotfix/0.1.1'
This commit is contained in:
		
						commit
						4890a9e1f9
					
				|  | @ -280,7 +280,7 @@ pypkg: python/dist/$(PYTHON_PKG_NAME)-$(VERSION).tar.gz | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| required_python_packages: | required_python_packages: | ||||||
| 	@$(PIP) install numpy matplotlib click-man | 	@$(PIP) install -r python/pip.freeze | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| python/VERSION: | python/VERSION: | ||||||
|  |  | ||||||
|  | @ -33,7 +33,7 @@ from pkg_resources import parse_version | ||||||
| 
 | 
 | ||||||
| try: | try: | ||||||
|     from setuptools_scm import get_version |     from setuptools_scm import get_version | ||||||
|     v = get_version(root='../../', relative_to=__file__, version_scheme="post-release") |     v = get_version(root='../../../', relative_to=__file__, version_scheme="post-release") | ||||||
|     v = parse_version(v) |     v = parse_version(v) | ||||||
|     if v._version.post[-1] == 0: |     if v._version.post[-1] == 0: | ||||||
|         __version__ = v.base_version |         __version__ = v.base_version | ||||||
|  |  | ||||||
|  | @ -1,3 +1,5 @@ | ||||||
|  | setuptools_scm | ||||||
| matplotlib | matplotlib | ||||||
|  | numpy | ||||||
| click | click | ||||||
| click-man | click-man | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue