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

Feature: Pypi auto deployement #428

Merged
merged 24 commits into from
Mar 6, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: python
python:
- "3.5"
- "3.6"
- 3.5
- 3.6

install:
- pip install -r requirements.txt
Expand All @@ -13,4 +13,14 @@ script:

branches:
only:
- master
- master

deploy:
provider: pypi
distributions: "sdist bdist_wheel"
user: aztk
password:
secure: j/mwA+hWudujDZ+JkgN3hDBUcIH3Vt1SWsvxnyUadErFsi9S9bW8OZ8kOp3R8yj73pnaENADmvDPjBt6w39b3h7l/EmNYlEdsAuPBMmaNQ0+fmPiKLCcALVIt/Odxdc+a1p2p+F3HEatqMCkaSRUs9gcHSYA1P57rt7y6i28xrCTt1ayQrdOZofgyAx4egocFQlgXgFpQIO3vNXySmc5HaIJF8h84CUKvLG/jv9bHgDoT7n2F00sQQV/tLbXdWEA2LcJFN5q4gjk3AwFtofTtMzlk3IE3y3qp9DagWbdsKoy9+b31lypVDBiIp/N+kCm/pwYDJXyG0H7U1pev2F8K/f4xF2x0AJDJJamLczAY4Ac4AMPImlI3cCpSS6htQhb+i5+KeEUW2tm+xGmdprOSto2712C4TNMna25x+WZteuPmRGYTmmDxGSeD769lE6TMGqrJTlmpkzndJiyp8ek/86hJPJUQoPfDadWdIdcA4wCjpXFBach4DYEItKvYoIk/KfK3wdqp3Lbs+MhT+JhuXGR0RRWlkCROiIo48TwQ716ddvjy2PPxwxNhplu3BdyEXLEDGN9EnEL+3L5P0GELhB4+KstjXSbECBYzULJ1+4kzvrdSB3K9F41stpT7x9PN9mK0t9FrVpXWbNozuJqkCvVVtz2ZSJ+20kvSuI1TPA=
on:
python: 3.6
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not exactly sure here, but does this not need to also have python: 3.5?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no this means I only want to publish the build of version 3.6(could be 3.5 too) just picked the latest

tags: true
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"bin/**": true
},
"files.exclude": {
"**/__pycache__": true
"**/__pycache__": true,
"*.egg-info": true,
},
"python.autoComplete.extraPaths": [
"${workspaceRoot}/node_scripts"
Expand Down
2 changes: 1 addition & 1 deletion aztk/utils/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"""
Source and destination paths for spark init
"""
INIT_DIRECTORY_SOURCE = os.path.join(ROOT_PATH, 'config')
INIT_DIRECTORY_SOURCE = os.path.join(ROOT_PATH, "aztk_cli", 'config')
LOCAL_INIT_DIRECTORY_DEST = os.path.join(os.getcwd(), '.aztk')
GLOBAL_INIT_DIRECTORY_DEST = os.path.join(HOME_DIRECTORY_PATH, '.aztk')
"""
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.6.0'
__version__ = '0.7.0b9'
2 changes: 2 additions & 0 deletions aztk_cli/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
import aztk_cli.logger
log = aztk_cli.logger.root
2 changes: 1 addition & 1 deletion cli/config.py → aztk_cli/config.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import os
import yaml
from cli import log
from aztk_cli import log
import aztk.spark
from aztk.spark.models import (
SecretsConfiguration,
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions cli/entrypoint.py → aztk_cli/entrypoint.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
from typing import NamedTuple
import azure.batch.models.batch_error as batch_error
import aztk
from cli import logger, log, utils, constants
from cli.spark.endpoints import spark
from aztk_cli import logger, log, utils, constants
from aztk_cli.spark.endpoints import spark
from . import plugins

def main():
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion cli/plugins.py → aztk_cli/plugins.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import argparse
import typing
from cli import log
from aztk_cli import log
from aztk.models.plugins.internal import plugin_manager


Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import argparse
import typing
import aztk.spark
from cli import log
from cli import utils, config
from aztk_cli import log
from aztk_cli import utils, config


def setup_parser(parser: argparse.ArgumentParser):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import typing
import aztk

from cli import utils, config
from aztk_cli import utils, config

def setup_parser(parser: argparse.ArgumentParser):
parser.add_argument('--id',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import argparse
import typing
import aztk.spark
from cli import config
from aztk_cli import config


def setup_parser(parser: argparse.ArgumentParser):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
import typing
import aztk.spark
from aztk.spark.models import ClusterConfiguration, UserConfiguration
from cli import log
from cli.config import load_aztk_spark_config
from cli import utils, config
from aztk_cli import log
from aztk_cli.config import load_aztk_spark_config
from aztk_cli import utils, config


def setup_parser(parser: argparse.ArgumentParser):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import argparse
import typing
import aztk
from cli import log, config
from aztk_cli import log, config


def setup_parser(parser: argparse.ArgumentParser):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import argparse
import typing
import aztk
from cli import log
from cli import utils, config
from aztk_cli import log
from aztk_cli import utils, config


def setup_parser(parser: argparse.ArgumentParser):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import argparse
import typing
import aztk
from cli import utils, config
from aztk_cli import utils, config


def setup_parser(_: argparse.ArgumentParser):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import argparse
import typing
import aztk.spark
from cli import utils, config
from aztk_cli import utils, config

def setup_parser(parser: argparse.ArgumentParser):
parser.add_argument('--id',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import argparse
import typing
from cli import log
from cli import utils, config
from cli.config import SshConfig
from aztk_cli import log
from aztk_cli import utils, config
from aztk_cli.config import SshConfig
import aztk
import azure.batch.models.batch_error as batch_error
from aztk.models import ClusterConfiguration
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import argparse
import typing
from cli import utils, config, log
from aztk_cli import utils, config, log
import aztk.spark


Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import argparse
import typing
import aztk.spark
from cli import log, config
from aztk_cli import log, config


def setup_parser(parser: argparse.ArgumentParser):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
import typing
import time
import aztk.spark
from cli import config
from cli import utils
from aztk_cli import config
from aztk_cli import utils

def setup_parser(parser: argparse.ArgumentParser):
parser.add_argument('--id',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
import typing
import time
import aztk.spark
from cli import config
from cli import utils
from aztk_cli import config
from aztk_cli import utils

def setup_parser(parser: argparse.ArgumentParser):
parser.add_argument('--id',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import argparse
import typing
import aztk.spark
from cli import utils, config
from aztk_cli import utils, config

def setup_parser(parser: argparse.ArgumentParser):
parser.add_argument('--id',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
import typing
import time
import aztk.spark
from cli import config
from cli import utils
from aztk_cli import config
from aztk_cli import utils

def setup_parser(_: argparse.ArgumentParser):
# No arguments for list yet
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import argparse
import typing
import aztk.spark
from cli import config
from cli import utils
from aztk_cli import config
from aztk_cli import utils

def setup_parser(parser: argparse.ArgumentParser):
parser.add_argument('--id',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
import typing
import time
import aztk.spark
from cli import config
from cli import utils
from aztk_cli import config
from aztk_cli import utils

def setup_parser(parser: argparse.ArgumentParser):
parser.add_argument('--id',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
import typing
import time
import aztk.spark
from cli import config
from cli import utils
from cli import log
from aztk_cli import config
from aztk_cli import utils
from aztk_cli import log


def setup_parser(parser: argparse.ArgumentParser):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
import typing
import time
import aztk.spark
from cli import config, utils, log
from cli.config import JobConfig, load_aztk_spark_config
from aztk_cli import config, utils, log
from aztk_cli.config import JobConfig, load_aztk_spark_config


def setup_parser(parser: argparse.ArgumentParser):
Expand Down
File renamed without changes.
2 changes: 0 additions & 2 deletions cli/__init__.py

This file was deleted.

1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ yapf==0.20.1
pylint==1.8.2
pytest==3.1.3
pytest-xdist==1.22.0
twine==1.9.1
73 changes: 55 additions & 18 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,22 +1,59 @@
import os
from setuptools import setup, find_packages
from cli import constants
from aztk_cli import constants
from aztk import version

data_files = []

setup(name='aztk',
version=version.__version__,
description='Utility for data engineers or platform developers to Run distributed jobs in Azure',
url='<tbd>',
author='Microsoft',
author_email='jiata@microsoft.com',
license='MIT',
packages=find_packages(),
scripts=[
# 'bin/aztk',
],
entry_points=dict(
console_scripts=[
"{0} = cli.entrypoint:main".format(constants.CLI_EXE)
]
),
zip_safe=False)

def find_package_files(root, directory, dest=""):
paths = []
for (path, _, filenames) in os.walk(os.path.join(root, directory)):
for filename in filenames:
paths.append(os.path.relpath(os.path.join(dest, path, filename), root))
return paths


with open('README.md') as fd:
long_description = fd.read()

setup(
name='aztk',
version=version.__version__,
description='On-demand, Dockerized, Spark Jobs on Azure (powered by Azure Batch)',
long_description=long_description,
url='https://github.com/Azure/aztk',
author='Microsoft',
author_email='askaztk@microsoft.com',
license='MIT',
packages=find_packages(exclude=["tests"]),
install_requires=[
"azure-batch==3.0.0",
"azure-mgmt-batch==5.0.0",
"azure-mgmt-storage==1.5.0",
"azure-storage==0.33.0",
"pyyaml>=3.12",
"pycryptodome>=3.4",
"paramiko>=2.4",
],
package_data={
'aztk': find_package_files("", "node_scripts", ".."),
'aztk_cli': find_package_files("aztk_cli", "config"),
},
scripts=[],
entry_points=dict(console_scripts=["{0} = aztk_cli.entrypoint:main".format(constants.CLI_EXE)]),
zip_safe=False,
classifiers=[
'Development Status :: 4 - Beta',
'Intended Audience :: Developers',
'License :: OSI Approved :: MIT License',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
],
project_urls={
'Documentation': 'https://github.com/Azure/aztk/wiki/',
'Source': 'https://github.com/Azure/aztk/',
'Tracker': 'https://github.com/Azure/aztk/issues',
},
python_requires='>=3.5',
)
2 changes: 1 addition & 1 deletion tests/spark/integration_tests/sdk/cluster/test_cluster.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import pytest
from aztk.utils import constants
from aztk.error import AztkError
from cli import config
from aztk_cli import config


# base cluster name
Expand Down
2 changes: 1 addition & 1 deletion tests/spark/integration_tests/sdk/job/test_job.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import aztk.spark
from aztk.error import AztkError
from cli import config
from aztk_cli import config

dt = datetime.now()
time = dt.microsecond
Expand Down