Skip to content
This repository has been archived by the owner on Feb 3, 2021. It is now read-only.

Bug: pypi long description #450

Merged
merged 26 commits into from
Apr 26, 2018
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
02a029b
update version and change long description content type
jafreck Mar 20, 2018
0f4ebf8
update travis to build on version tags
jafreck Mar 20, 2018
d89b0d1
update version
jafreck Mar 20, 2018
755ed3b
update twine version and aztk version
jafreck Mar 20, 2018
88162f9
add twine to travis
jafreck Mar 20, 2018
df0ee34
Merge branch 'master' into bug/pypi-long-description
jafreck Apr 5, 2018
a699089
Update version.py
jafreck Apr 16, 2018
cec8bb4
Merge remote-tracking branch 'upstream/master' into bug/pypi-long-des…
jafreck Apr 23, 2018
1815d26
bump version
jafreck Apr 23, 2018
e07f131
Merge branch 'master' into bug/pypi-long-description
jafreck Apr 23, 2018
e2770eb
add plugins
jafreck Apr 23, 2018
854c152
bump version
jafreck Apr 23, 2018
d17a62c
bump version
jafreck Apr 24, 2018
67d5cde
Merge branch 'master' into bug/pypi-long-description
jafreck Apr 24, 2018
64f46e7
bump version
jafreck Apr 24, 2018
d1ace71
Merge remote-tracking branch 'upstream/master' into bug/pypi-long-des…
jafreck Apr 24, 2018
def81ff
update dest
jafreck Apr 24, 2018
339e507
Merge branch 'master' into bug/pypi-long-description
timotheeguerin Apr 24, 2018
1c580ee
remove debug from travis build
jafreck Apr 26, 2018
038ceaf
update travis, fix setup.py includes, bump version
jafreck Apr 26, 2018
d037215
Merge remote-tracking branch 'upstream/master' into bug/pypi-long-des…
jafreck Apr 26, 2018
ec388a1
update azure batch version to 4.1.3
jafreck Apr 26, 2018
b15dedd
add reqs back to travis
jafreck Apr 26, 2018
d2578d2
merge
jafreck Apr 26, 2018
a7809c2
bump version
jafreck Apr 26, 2018
6e74150
remove commented dependencies
jafreck Apr 26, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ python:
install:
- pip install -r requirements.txt
- pip install -e .
- twine --version

script:
- pylint -E aztk
Expand All @@ -14,6 +15,7 @@ script:
branches:
only:
- master
- /^v.*$/

deploy:
provider: pypi
Expand Down
2 changes: 1 addition & 1 deletion aztk/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.

__version__ = '0.7.0b9'
__version__ = '0.7.0b17'
3 changes: 2 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ yapf==0.20.1
pylint==1.8.2
pytest==3.1.3
pytest-xdist==1.22.0
twine==1.9.1
twine==1.11.0


# There is a breaking change is 3.0.0 of this package and the depenency chain of other package is not defined correcly
SecretStorage==2.3.1
Expand Down
2 changes: 2 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ def find_package_files(root, directory, dest=""):
version=version.__version__,
description='On-demand, Dockerized, Spark Jobs on Azure (powered by Azure Batch)',
long_description=long_description,
long_description_content_type='text/markdown',
url='https://github.com/Azure/aztk',
author='Microsoft',
author_email='askaztk@microsoft.com',
Expand All @@ -38,6 +39,7 @@ def find_package_files(root, directory, dest=""):
],
package_data={
'aztk': find_package_files("", "node_scripts", ".."),
'aztk': find_package_files("", "spark/models/plugins"),
'aztk_cli': find_package_files("aztk_cli", "config"),
},
scripts=[],
Expand Down