Remove convert, improve generate

.gitignore

@@ -1,158 +1,69 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2016-present, CloudZero, Inc. All rights reserved.
-# Licensed under the BSD-style license. See LICENSE file in the project root for full license information.
+# Copyright (c) 2020 CloudZero - ALL RIGHTS RESERVED - PROPRIETARY AND CONFIDENTIAL
+# Unauthorized copying of this file and/or project, via any medium is strictly prohibited.
+# Direct all questions to legal@cloudzero.com
 
-
-*.py[cod]
-__pycache__
+# Mac OS garbage
 .DS_Store
+*.out
 
-# C extensions
-*.so
-
-# Packages
-*.egg
-*.egg-info
-dist
-build
-eggs
-parts
-var
-sdist
-develop-eggs
-.installed.cfg
-lib
-lib64
-wheelhouse
-
-# Installer logs
-pip-log.txt
-
-# Unit test / coverage reports
-.coverage
+# Python tests
+.coverage*
+.pytest_cache
 .tox
+.cache
 coverage-reports
-test-results
 coverage.xml
-nosetests.xml
-htmlcov
-junit.xml
-.cache
-.*flake*out
-.*coverage*
-.py36*
+test-results
 .hypothesis
-git_stats/
-
-# Code stats
-clonedigger.xml
-
-# Translations
-*.mo
-
-# Complexity
-output/*.html
-output/*/index.html
-
-# Sphinx
-docs/_build
-docs/_static
-
-# IDE's
-.idea
-*~
-
-# py.test
-pytestdebug.log
-.pytest_cache
-
-# dynamodb local
-*.db
-*.sqlite
-
-# Vagrant
-.vagrant/
 
-# Sonarcloud
-.scannerwork
-
-#junk
-*.pid
-*.backup
-
-# Packages and Dependencies
-vendored/
-node_modules/
-
-#terraform
-.terraform*
-
-# Serverless work directory
-.serverless
-
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
+# JS tests
 coverage
 coverage-watch
+mb.pid
 
-# Webpack-related artifacts
-webpack-debug-stats.json
-webpack-release-stats.json
-
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# Bower dependency directory (https://bower.io/)
-bower_components
+# JS dependencies
+node_modules
+frontend/dist
 
-# node-waf configuration
-.lock-wscript
+# SAM/Lambda artifacts
+app.zip
+vendored
+packaged-template.yaml
 
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directories
-node_modules/
-jspm_packages/
-
-# Typescript v1 declaration files
-typings/
-
-# Optional npm cache directory
-.npm
-
-# Optional eslint cache
-.eslintcache
-
-# Optional REPL history
-.node_repl_history
+# Python artifacts
+__pycache__
+*.pyc
+dist
+sdist
+*.egg-info
+.python-version
 
-# Output of 'npm pack'
-*.tgz
+# PyCharm
+.idea
 
-# Yarn Integrity file
-.yarn-integrity
+# Makefile temp stuff
+.cz_*_verified
+.cz_py_dependencies_installed
 
-# dotenv environment variables file
-.env
+# Log files
+*.log
 
-# text editor
+# editor files
 *.swp
+*.swo
+*.swn
+.python-version
+
+# auth0 config
+.jwt.js
+.jwt.cjs.js
+.auth0-credentials.json
+.mypy_cache
+
+# testing
+response.json
+email_output.html
+email_output.txt
+notifications_repl_output.json
+.vscode/
+.aws-sam/

.semaphore/semaphore.yml

@@ -7,13 +7,13 @@ agent:
 global_job_config:
   prologue:
     commands:
-      - sem-version python 3.8
+      - sem-version python 3.9
       - checkout
-      - cache restore dev-requirements-$SEMAPHORE_GIT_BRANCH-$(checksum requirements-dev.txt),requirements
+      - cache restore requirements-$SEMAPHORE_GIT_BRANCH-$(checksum requirements-dev.txt)-$(checksum requirements.txt)
       - make init
   epilogue:
     commands:
-      - cache store dev-requirements-$SEMAPHORE_GIT_BRANCH-$(checksum requirements-dev.txt) /home/semaphore/.pyenv/3.8
+      - cache store requirements-$SEMAPHORE_GIT_BRANCH-$(checksum requirements-dev.txt)-$(checksum requirements.txt) /home/semaphore/.pyenv/3.9
 blocks:
   - name: Run Tests
     task:

Makefile

@@ -31,20 +31,6 @@ help:                                    ## Prints the names and descriptions of
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
 
-#################
-#
-# Docker Targets
-#
-#################
-check-docker:                            ## Exits if docker is not installed and available
-	@if which docker &>/dev/null ; then \
-		printf "$(INFO_COLOR)OK:$(NO_COLOR) docker found on path!\n" ; \
-	else \
-		printf "$(ERROR_COLOR)ERROR:$(NO_COLOR) docker not found on path. Please install and configure docker!\n" ; \
-		exit 1 ; \
-	fi
-
-
 #################
 #
 # Python Targets
@@ -56,8 +42,8 @@ init:                                    ## ensures all dev dependencies into th
 	python ./setup.py develop
 
 
-test: check-docker                       ## runs the unit tests on all available python runtimes
-	pytest uca tests
+test: 				                      ## runs the unit tests on all available python runtimes
+	pytest
 
 
 lint:                                    ## lints the code via adherence to PEP8 standards
@@ -87,7 +73,7 @@ check-version:							## check that version is not in pypi
 
 build: test                             ## Builds the project as a wheel
 	rm -rf dist/
-	python ./setup.py sdist
+	python ./setup.py sdist bdist_wheel
 
 upload: build check-version             ## twine uploads dist/*
 	twine upload dist/*