v0.1.1

Author: erdogant

clusteval/__init__.py

@@ -11,7 +11,7 @@
 
 __author__ = 'Erdogan Tasksen'
 __email__ = '[email protected]'
-__version__ = '0.1.0'
+__version__ = '0.1.1'
 
 
 # module level doc-string

make_clean.sh

@@ -0,0 +1,4 @@
+echo "Cleaning previous builds first.."
+rm -rf dist
+rm -rf build
+rm -rf hnet.egg-info

make_new_build.sh

@@ -3,18 +3,21 @@ rm -rf dist
 rm -rf build
 rm -rf clusteval.egg-info
 
-read -p "Making source build after pressing [Enter].."
-echo "Making new build.."
+echo "Making new wheel.."
 echo ""
 python setup.py bdist_wheel
 echo ""
-read -p "Making source build after pressing [Enter].."
-echo 
+
+echo "Making source build .."
+echo ""
 python setup.py sdist
 echo ""
+
 read -p "Press [Enter] to install the pip package..."
-pip install -U dist/clusteval-0.1.0-py3-none-any.whl
+pip install -U dist/clusteval-0.1.1-py3-none-any.whl
 echo ""
+
 read -p ">twine upload dist/* TO UPLOAD TO PYPI..."
 echo ""
+
 read -p "Press [Enter] key to close window..."

make_new_release.py

@@ -0,0 +1,102 @@
+"""Make new release on github and pypi.
+
+Description
+-----------
+A new release is created by taking the underneath steps:
+    1. List all files in current directory and exclude all except the directory-of-interest
+    2. Extract the version from the __init__.py file
+    3. Remove old build directories such as dist, build and x.egg-info
+    4. Git pull
+    5. Get latest version from github
+    6. Check if the current version is newer then github lates--version.
+        a. Make new wheel, build and install package
+        b. Set tag to newest version and push to git
+        c. Upload to pypi (credentials required)
+"""
+
+import os
+import re
+import numpy as np
+import urllib.request
+import yaml
+import shutil
+from packaging import version
+yaml.warnings({'YAMLLoadWarning': False})
+# GITHUB
+GITHUBNAME = 'erdogant'
+TWINE_PATH = 'C://Users/Erdogan/AppData/Roaming/Python/Python36/Scripts/twine.exe upload dist/*'
+
+
+# %% Main function
+if __name__ == '__main__':
+    # Clean screen
+    os.system('cls')
+    # List all files in dir
+    filesindir = np.array(list(map(lambda x: x.lower(), np.array(os.listdir()))))
+    # Remove all the known not relevant files and dirs
+    exclude = np.array(['__pycache__','_version','make_new_release.py','get_release_github.sh','setup.py','get_version.py','readme.md','.git','.gitignore','build','dist','docs','license','make_new_build.sh','make_new_realease.sh','manifest.in','requirements.txt','setup.cfg','test.py'])  # noqa
+    getfile = filesindir[np.isin(filesindir, exclude)==False][0]  # noqa
+    # This must be the dir of interest
+    INIT_FILE = getfile + "/__init__.py"
+    print('Working on package: [%s]' %(getfile))
+
+    # Find version now
+    if os.path.isfile(INIT_FILE):
+        # Extract version from __init__.py
+        getversion = re.search(r"^__version__ = ['\"]([^'\"]*)['\"]", open(INIT_FILE, "rt").read(), re.M)
+        if getversion:
+            # Remove build directories
+            print('Removing local build directories..')
+            if os.path.isdir('dist'): shutil.rmtree('dist')
+            if os.path.isdir('build'): shutil.rmtree('build')
+            if os.path.isdir(getfile + '.egg-info'): shutil.rmtree(getfile + '.egg-info')
+
+            # Pull latest from github
+            print('git pull')
+            os.system('git pull')
+
+            # Get version number
+            current_version = getversion.group(1)
+            # This is the current version described in our __init__.py file
+            print('Current version: %s' %(current_version))
+            # Get latest version of github release
+            github_url = 'https://api.github.com/repos/' + GITHUBNAME + '/' + getfile + '/releases/latest'
+            github_page = urllib.request.urlopen(github_url)
+            github_data = github_page.read()
+            github_version = yaml.load(github_data)['tag_name']
+            print('Github version: %s' %(github_version))
+            print('Github version requested from: %s' %(github_url))
+
+            # Continue with the process of building a new version if the current version is really newer then the one on github!
+            VERSION_OK = version.parse(current_version)>version.parse(github_version)
+            if VERSION_OK:
+                # Make new build
+                print('Making new wheel..')
+                os.system('python setup.py bdist_wheel')
+                # Make new build
+                print('Making source build..')
+                os.system('python setup.py sdist')
+                # Make new build
+                print('Installing new wheel..')
+                os.system('pip install -U dist/' + getfile + '-' + current_version + '-py3-none-any.whl')
+                # git commit
+                print('git add->commit->push')
+                os.system('git add .')
+                # os.system('git commit -m v'+current_version)
+                # os.system('git push')
+                # Set tag for this version
+                print('Set new version tag: %s' %(current_version))
+                os.system('git tag -a v' + current_version + ' -m "' + current_version + '"')
+                os.system('git push origin --tags')
+                print('Upload to pypi..')
+                os.system(TWINE_PATH)
+            else:
+                print('Not released! You need to increase your version: [%s]' %(INIT_FILE))
+
+            # f = open("_version", "w")
+            # f.write(new_version)
+            # f.close()
+        else:
+            raise RuntimeError("Unable to find version string in %s." % (INIT_FILE,))
+    else:
+        print('Oh noo File not found: %s' %(INIT_FILE))

setup.py

@@ -13,7 +13,7 @@
 with open("README.md", "r") as fh:
     long_description = fh.read()
 setuptools.setup(
-     install_requires=['matplotlib','numpy','pandas','tqdm','seaborn','hdbscan'],
+     install_requires=['matplotlib','numpy','pandas','tqdm','seaborn'],
      python_requires='>=3',
      name='clusteval',
      version=new_version,