Merge branch 'master' into develop

Author: koalalorenzo

.dockerignore

@@ -1,2 +1,3 @@
+.git/
 *.pyc
 *__pycache__

.github/workflows/publish.yml

@@ -0,0 +1,24 @@
+name: Upload Python Package on Release
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: '3.x'
+    - name: Install dependencies
+      run: make publish_deps deps 
+    - name: Test code
+      run: make test
+    - name: Build and publish
+      env:
+        TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
+        TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+      run: make clean dist publish

.github/workflows/tests.yml

@@ -0,0 +1,23 @@
+name: Python Tests
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        python-version: ['2.x', '3.x', 3.6, 3.7, 3.8]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: make deps
+    - name: Run tests
+      run: make test

.gitignore

@@ -42,3 +42,5 @@ MANIFEST
 
 .venv
 
+*.sw[pon]
+.eggs

.travis.yml

@@ -43,7 +43,7 @@ digitalocean.com APIs, such as:
 -  Enable/Disable automatic Backups
 -  Restore root password of a Droplet
 
- Examples
+Examples
 ---------
 
 Listing the droplets

DESCRIPTION.rst

@@ -1,21 +1,14 @@
-# Dokcerfile made to test this
-FROM ubuntu:14.04
+# Dockerfile made to test this
+FROM python:alpine
 
-MAINTAINER Lorenzo Setale <koalalorenzo@gmail.com>
-
-RUN apt-get update
-RUN apt-get install --yes git python3-dev python3-pip python-dev python-pip
-RUN pip3 install -U pip
-RUN pip2 install -U pip
+MAINTAINER Lorenzo Setale <lorenzo@setale.me>
 
 RUN pip3 install -U python-digitalocean pytest
-RUN pip2 install -U python-digitalocean pytest
-
-WORKDIR /root/
-ADD . /root/python-digitalocean
 
 WORKDIR /root/python-digitalocean
-RUN pip2 install -U -r requirements.txt
+ADD requirements.txt requirements.txt
 RUN pip3 install -U -r requirements.txt
 
-CMD python2 -m pytest ; python3 -m pytest
+ADD . /root/python-digitalocean
+
+CMD python3 -m pytest

Dockerfile

@@ -0,0 +1,27 @@
+clean:
+	rm -rf build 
+	rm -rf dist 
+	rm -rf python_digitalocean.egg-info 
+	rm -rf .pytest_cache
+.PHONY: clean
+
+dist:
+	python setup.py sdist bdist_wheel
+
+publish: dist
+	twine upload dist/*
+.PHONY: publish
+
+publish_deps:
+	python -m pip install --upgrade pip
+	pip install setuptools wheel twine
+.PHONY: publish_deps
+
+deps:
+	pip install -U -r requirements.txt
+.PHONY: deps
+
+test:
+	python -m pytest
+.PHONY: test
+