Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/dbcli/mssql-cli
Browse files Browse the repository at this point in the history
  • Loading branch information
pensivebrian committed Aug 19, 2019
2 parents d66c3f3 + fd0c916 commit 595e2ad
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.15.0
current_version = 0.16.0
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)
serialize =
{major}.{minor}.{patch}
Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. image:: https://badge.fury.io/py/mssql_cli.svg
:target: https://pypi.python.org/pypi/mssql_cli
.. image:: https://badge.fury.io/py/mssql-cli.svg
:target: https://pypi.python.org/pypi/mssql-cli

.. image:: https://img.shields.io/pypi/pyversions/mssql-cli.svg
:target: https://github.com/dbcli/mssql-cli
Expand Down
2 changes: 1 addition & 1 deletion build_scripts/debian/build.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

CLI_VERSION=0.15.0
CLI_VERSION=0.16.0

if [ -z "$1" ]
then
Expand Down
2 changes: 1 addition & 1 deletion build_scripts/rpm/mssql-cli.spec
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
%define name mssql-cli
%define release 1%{?dist}
%define time_stamp %(date +%y%m%d%H%M)
%define base_version 0.15.0
%define base_version 0.16.0
%define python_dir %{_builddir}/python_env
%define python_url https://www.python.org/ftp/python/3.6.1/Python-3.6.1.tgz
%define cli_lib_dir %{_libdir}/mssql-cli
Expand Down
8 changes: 4 additions & 4 deletions doc/release_guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ The steps below outline how to build mssql-cli locally on your dev environment.
## 2. Install
1. Test install locally:
To install the local mssql-scripter wheel package, from `<clone_root>` execute:
To install the local mssql-cli wheel package, from `<clone_root>` execute:
```
sudo pip install --no-index -i ./dist/mssql_scripter-1.0.0a1-py2.py3-none-win32.whl
sudo pip install --no-index -i ./dist/mssql_cli-0.16.0.dev1908130743-py2.py3-none-win_amd64.whl
```
# <a name="Daily"></a>Daily builds
Expand All @@ -82,7 +82,7 @@ The steps below outline how daily builds of mssql-cli are generated. These steps
## 2. Install
3. Test install from daily storage account:
```
pip install --pre --no-cache --extra-index-url https://mssqlcli.blob.core.windows.net/daily mssql-cli
pip install --pre --no-cache --extra-index-url https://mssqlcli.blob.core.windows.net/daily/whl mssql-cli
```
# <a name="Official"></a>Official builds
Expand Down Expand Up @@ -124,7 +124,7 @@ The steps below outline how to build official builds and publish to PYPI.
4. Publish to daily storage account:
```
python build.py publish_daily
python release.py publish_daily
```
5. Download official wheels from storage account:
Expand Down
2 changes: 1 addition & 1 deletion mssqlcli/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '0.15.0'
__version__ = '0.16.0'
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ def get_timestamped_version(version):
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: SQL',
'Topic :: Database',
'Topic :: Database :: Front-Ends',
Expand Down

0 comments on commit 595e2ad

Please sign in to comment.