Bug: pypi long description (#450)

* update version and change long description content type

* update travis to build on version tags

* update version

* update twine version and aztk version

* add twine to travis

* Update version.py

* bump version

* add plugins

* bump version

* bump version

* bump version

* update dest

* remove debug from travis build

* update travis, fix setup.py includes, bump version

* update azure batch version to 4.1.3

* add reqs back to travis

* bump version

* remove commented dependencies

.travis.yml

@@ -14,6 +14,7 @@ script:
 branches:
   only:
     - master
+    - /^v.*$/
 
 deploy:
   provider: pypi

aztk/node_scripts/requirements.txt

@@ -1,10 +1,6 @@
-azure-batch==3.0.0
+azure-batch==4.1.3
 azure-mgmt-batch==5.0.0
 azure-mgmt-storage==1.5.0
 azure-storage-blob==1.1.0
 pyyaml==3.12
 pycryptodome==3.4.7
-
-# 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
-keyring==12.0.1

aztk/version.py

@@ -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.0b20'

requirements.txt

@@ -1,5 +1,5 @@
 # Distribution
-azure-batch==3.0.0
+azure-batch==4.1.3
 azure-mgmt-batch==5.0.0
 azure-mgmt-storage==1.5.0
 azure-storage-blob==1.1.0
@@ -12,7 +12,7 @@ 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
 docker==3.2.1
 
 # Docs
@@ -21,7 +21,3 @@ sphinx-autobuild==0.7.1
 recommonmark==0.4.0
 sphinx_rtd_theme==0.3.0
 docutils==0.12
-
-# 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
-keyring==12.0.1

setup.py

@@ -1,16 +1,28 @@
+import fnmatch
 import os
-from setuptools import setup, find_packages
-from aztk_cli import constants
+
+from setuptools import find_packages, setup
+
 from aztk import version
+from aztk_cli import constants
+
 
 data_files = []
 
 
+def _includeFile(filename: str, exclude: [str]) -> bool:
+    for pattern in exclude:
+        if fnmatch.fnmatch(filename, pattern):
+            return False
+
+    return True
+
 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))
+            if _includeFile(filename, exclude=["*.pyc*"]):
+                paths.append(os.path.relpath(os.path.join(dest, path, filename), root))
     return paths
 
 
@@ -22,13 +34,14 @@ 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='[email protected]',
     license='MIT',
     packages=find_packages(exclude=["tests"]),
     install_requires=[
-        "azure-batch==3.0.0",
+        "azure-batch==4.1.3",
         "azure-mgmt-batch==5.0.0",
         "azure-mgmt-storage==1.5.0",
         "azure-storage-blob==1.1.0",
@@ -37,8 +50,8 @@ def find_package_files(root, directory, dest=""):
         "paramiko>=2.4",
     ],
     package_data={
-        'aztk': find_package_files("", "node_scripts", ".."),
-        'aztk_cli': find_package_files("aztk_cli", "config"),
+        'aztk': find_package_files("aztk", ""),
+        'aztk_cli': find_package_files("aztk_cli", ""),
     },
     scripts=[],
     entry_points=dict(console_scripts=["{0} = aztk_cli.entrypoint:main".format(constants.CLI_EXE)]),