diff --git a/README.md b/README.md index 2e323a6..7bdf01e 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ![Static Badge](https://img.shields.io/badge/python-%3E%3D3.4-green) [![Static Badge](https://img.shields.io/badge/licence-MIT(hpp)-green)](https://github.com/BR1py/itertree/blob/main/LICENSE) [![Static Badge](https://img.shields.io/badge/documenation-https%3A%2F%2Fitertree.readthedocs.io%2Fen%2Flatest%2F-yellow?logo=readthedocs)](https://itertree.readthedocs.io/en/latest/) -![GitHub Release 1.1.2 - Published_At](https://img.shields.io/github/release-date/Br1py/itertree) +![GitHub Release 1.1.3 - Published_At](https://img.shields.io/github/release-date/Br1py/itertree) # itertree python package @@ -11,7 +11,7 @@ ## Welcome to itertree python package -Release 1.1.2 - released +Release 1.1.3 - released * Do you have to store data in a tree like structure? * Do you need good performance and a reach feature set in the tree object? diff --git a/build_helpers/build_wheel.cmd b/build_helpers/build_wheel.cmd new file mode 100644 index 0000000..d79c469 --- /dev/null +++ b/build_helpers/build_wheel.cmd @@ -0,0 +1,6 @@ +c:\tools\python\python39\python -m build + +rem For PyPi upload use: +rem c:\tools\python\python35\python -m twine upload dist/* + +pause \ No newline at end of file diff --git a/build_helpers/commit_to_pypi.txt b/build_helpers/commit_to_pypi.txt new file mode 100644 index 0000000..083fa94 --- /dev/null +++ b/build_helpers/commit_to_pypi.txt @@ -0,0 +1,10 @@ +workflow + +1. ensure that all version informations in th epackage are updated properly +1b. Check especially in README.md! +2. build the wheel via build_wheel.cmd +3. PyPi upload: +c:\tools\python\python35\python -m twine upload dist/* +4. push dev to main on git +5. recheck if readthedocs was properly updated +6. Create the release on GIT and tag it diff --git a/build_helpers/update_version.py b/build_helpers/update_version.py new file mode 100644 index 0000000..ca62908 --- /dev/null +++ b/build_helpers/update_version.py @@ -0,0 +1,71 @@ +# -*- coding: utf-8 -*- +import os +VERSION='1.1.3' + +def replacer(filename,pre_tag,post_tag): + print('Update version in %s' % filepath) + if type(pre_tag) is str: + o1='r' + o2='w' + version=VERSION + else: + o1='rb' + o2='wb' + version=VERSION.encode() + + with open(filepath, o1) as fh: + text = fh.read() + i1 = text.find(pre_tag) + if i1==-1: + raise SyntaxError('pre_tag not found!') + i1=i1 + len(pre_tag) + i2 = text.find(post_tag, (i1 + 1)) + if i2==-1: + raise SyntaxError('post_tag not found!') + if i2-i1>len(version): + raise SyntaxError('Extracted search string to large!') + print('Old version found:', repr(text[i1:i2]), '(position: %i:%i)' % (i1, i2)) + text = text[:i1] + version + text[i2:] + with open(filepath, o2) as fh: + fh.write(text) + print('%s version updated\n' % filepath) + + +#README.md + +print('Write version: %s into the files\n'%VERSION) + +filepath = 'src/itertree/__init__.py' +pre_tag=b'__version__ = \'' +post_tag=b'\'' +replacer(filepath,pre_tag,post_tag) + + +filepath = 'README.md' +pre_tag='Release ' +post_tag=' ' +replacer(filepath,pre_tag,post_tag) + +#setup.cfg +filepath = 'setup.cfg' +pre_tag='version = ' +post_tag='\n' +replacer(filepath,pre_tag,post_tag) + +#setup.py +filepath = 'setup.py' +pre_tag='version=\'' +post_tag='\'' +replacer(filepath,pre_tag,post_tag) + +filepath='docs/conf.py' +pre_tag='release = \'' +post_tag='\'' +replacer(filepath,pre_tag,post_tag) + +filepath = 'docs/index.rst' +pre_tag='Version | ' +post_tag='|' +replacer(filepath,pre_tag,post_tag) + +print('HINT: Versions in docs/changelog.rst are not updated!\n') diff --git a/dist/itertree-1.1.2.tar.gz b/dist/itertree-1.1.2.tar.gz deleted file mode 100644 index 0659af6..0000000 Binary files a/dist/itertree-1.1.2.tar.gz and /dev/null differ diff --git a/dist/itertree-1.1.2-py3-none-any.whl b/dist/itertree-1.1.3-py3-none-any.whl similarity index 92% rename from dist/itertree-1.1.2-py3-none-any.whl rename to dist/itertree-1.1.3-py3-none-any.whl index 07de0cb..da264b0 100644 Binary files a/dist/itertree-1.1.2-py3-none-any.whl and b/dist/itertree-1.1.3-py3-none-any.whl differ diff --git a/dist/itertree-1.1.3.tar.gz b/dist/itertree-1.1.3.tar.gz new file mode 100644 index 0000000..55875eb Binary files /dev/null and b/dist/itertree-1.1.3.tar.gz differ diff --git a/docs/conf.py b/docs/conf.py index 3a4aede..00b2701 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -59,7 +59,7 @@ # The short X.Y version. # The full version, including alpha/beta/rc tags. -release = '1.1.2' +release = '1.1.3' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/docs/changelog.rst b/docs/docs/changelog.rst index 0a2e04b..52cb082 100644 --- a/docs/docs/changelog.rst +++ b/docs/docs/changelog.rst @@ -4,6 +4,12 @@ Version 1.1.2 ************************************ +Bugfix added missing folder in package + +************************************ +Version 1.1.2 +************************************ + New iteration features: The iteration features are havily imporved. The user can now iterate in diffrent directions and over diffrent levels in the itertree. diff --git a/docs/index.rst b/docs/index.rst index b5b4b29..e203f51 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -88,7 +88,7 @@ Status and compatibility information Please use the `github issues `_ to ask questions report problems. -.. |release| replace:: Version | 1.1.2| +.. |release| replace:: Version | 1.1.3| .. _release: https://pypi.python.org/pypi/itertree/ The original implementation is done in Python 3.9 and it is tested under Python 3.5, 3.6 and 3.9. The package diff --git a/setup.cfg b/setup.cfg index ec65d95..50a3d1f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,7 +1,7 @@ [metadata] # replace with your username: name = itertree-B_R -version = 1.1.2 +version = 1.1.3 author = B.R. author_email = br_development@posteo.org description = A package for creating tree structures and related data diff --git a/setup.py b/setup.py index 0bddda3..0be5d5b 100644 --- a/setup.py +++ b/setup.py @@ -2,8 +2,8 @@ setup( name='itertree', - version='1.1.2', - packages=['itertree', 'itertree.examples', 'itertree.itree_serializer'], + version='1.1.3', + packages=['itertree', 'itertree.examples', 'itertree.itree_serializer','itertree.itree_indepth_helpers'], package_dir={'': 'src'}, url='https://github.com/BR1py/itertree', license='MIT', diff --git a/src/itertree/__init__.py b/src/itertree/__init__.py index fb255e2..619e8f5 100644 --- a/src/itertree/__init__.py +++ b/src/itertree/__init__.py @@ -38,7 +38,7 @@ from __future__ import absolute_import __package__ = 'itertree' -__version__ = '1.1.2' +__version__ = '1.1.3' __licence__ = 'MIT incl. human protect patch' __author__ = 'B.R.' __url__ = 'https://github.com/BR1py/itertree'