diff --git a/README.md b/README.md index 083e15e22..1b25f7e84 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -# VisiData v2.10.1 [![twitter @VisiData][1.1]][1] [![CircleCI](https://circleci.com/gh/saulpw/visidata/tree/stable.svg?style=svg)](https://circleci.com/gh/saulpw/visidata/tree/stable) [![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/saulpw/visidata) +# VisiData v2.10.2 [![twitter @VisiData][1.1]][1] [![CircleCI](https://circleci.com/gh/saulpw/visidata/tree/stable.svg?style=svg)](https://circleci.com/gh/saulpw/visidata/tree/stable) [![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/saulpw/visidata) A terminal interface for exploring and arranging tabular data. diff --git a/dev/checklists/release.md b/dev/checklists/release.md index 461d820d6..db15f3b42 100644 --- a/dev/checklists/release.md +++ b/dev/checklists/release.md @@ -30,14 +30,25 @@ b. update the date in the manpage; - c. update version number on README and front page of website (update dates here too); + c. update version number on README d. bump version in `__version__` in source code (visidata/main.py, visidata/__init__.py) and setup.py; 6. Run dev/mkman.sh to build the manpage and updated website - Run ./mkmanhtml.sh, and move that to visidata.org:site/docs/man, and to visidata:docs/man.md -7. Push `develop` to testpypi +7. Merge `develop` to stable + +8. Merge `stable` back into other branches + + a. if the branch works with minimal conflicts, keep the branch + + b. otherwise, clean out the branch + + +9. Push code to stable + +10. Push `develop` to pypi a. set up a ~/.pypirc @@ -57,69 +68,38 @@ password: ``` - b. push to testpypi + Push to pypi ``` python3 setup.py sdist bdist_wheel --universal - twine upload dist/* -r testpypi + twine upload dist/* ``` -8. Test install from testpypi - - a. on virgin instance - - b. on mac and linux - - c. See if windows works - - d. from git clone - - ``` - pip3 install -i https://test.pypi.org/simple/ visidata - ``` - -9. Merge `develop` to stable - -10. Merge `stable` back into other branches - - a. if the branch works with minimal conflicts, keep the branch - - b. otherwise, clean out the branch - - -11. Push code to stable - -12. Push stable to pypi - -``` -twine upload dist/* -``` - -13. Test install/upgrade from pypi +11. Test install/upgrade from pypi a. Build and deploy the website b. Ask someone else to test install -14. Create a tag `v#.#.#` for that commit +12. Create a tag `v#.#.#` for that commit ``` git tag v#.#.# git push --tags ``` -15. Write up the release notes and add it to `www/releases.md`. Add it to index.md. +13. Write up the release notes and add it to `www/releases.md`. Add it to index.md. -16. Upload new motd +14. Upload new motd -17. Update the website by pushing to master. Update with new manpage. Update redirect to point to new manpage. +15. Update the website by pushing to master. Update with new manpage. Update redirect to point to new manpage. - release notes -18. Comb through issues and close the ones that have been solved, referencing the version number +16. Comb through issues and close the ones that have been solved, referencing the version number -19. Post github release notes on patreon. +17. Post github release notes on patreon. -20. Update the other distributions. +18. Update the other distributions. # conda diff --git a/setup.py b/setup.py index e05ae5116..ee73dfa81 100755 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ from setuptools import setup # tox can't actually run python3 setup.py: https://github.com/tox-dev/tox/issues/96 #from visidata import __version__ -__version__ = '2.11dev' +__version__ = '2.10.2' setup(name='visidata', version=__version__, diff --git a/visidata/__init__.py b/visidata/__init__.py index 9f049d041..c1f5538ea 100644 --- a/visidata/__init__.py +++ b/visidata/__init__.py @@ -1,6 +1,6 @@ 'VisiData: a curses interface for exploring and arranging tabular data' -__version__ = '2.11dev' +__version__ = '2.10.2' __version_info__ = 'VisiData v' + __version__ __author__ = 'Saul Pwanson ' __status__ = 'Production/Stable' diff --git a/visidata/main.py b/visidata/main.py index fae041924..cba4d7478 100755 --- a/visidata/main.py +++ b/visidata/main.py @@ -2,7 +2,7 @@ # Usage: $0 [] [ ...] # $0 [] --play [--batch] [-w ] [-o ] [field=value ...] -__version__ = '2.11dev' +__version__ = '2.10.2' __version_info__ = 'saul.pw/VisiData v' + __version__ from copy import copy