Merge remote-tracking branch 'upstream/master'

Use pipenv instead of requirements.txt

See merge request ungleich-public/ungleich-cli!4

README.md

@@ -5,12 +5,13 @@ It is intended to be used by ungleich engineers and skilled customers.
 
 ## Requirements / Installation
 
-* ensure you have python3
+* ensure you have **python3** and **pipenv**
 * git clone this repo
 * cd into this repo
 * run the following command
 ```
-sudo pip3 install -r requirements.txt
+pipenv install
+pipenv shell
 ```
 
 ## Usage general
@@ -52,6 +53,11 @@ ungleich account --create-user <username> --name <firstname> --lastname <lastnam
 
 ### Usage: SSH Key
 
+Requires you to have
+https://code.ungleich.ch/ungleich-public/ungleich-ssh-keys/ checked
+out in ~/vcs/ungleich-ssh-keys
+
+
 ```
 ungleich sshkey  --key raul.ascencio --host dev.raul.ungleich.cloud
 ```

requirements.txt

@@ -1 +0,0 @@
-git+https://github.com/apixu/apixu-python.git@master#egg=apixu

ungleich_dns.py

@@ -1,5 +1,7 @@
-import requests
+
+import urllib.request
 import argparse
+import json
 
 class ungleichDNS(object):
     def __init__(self, parser, parents):
@@ -20,14 +22,21 @@ class ungleichDNS(object):
 
     def _handle_dns(self, args):
         """Reverse dns endpoint."""
-        r = requests.post(
-            'https://dns.service.ungleich.ch',
-            json={
+        url = 'https://dns.service.ungleich.ch'
+        req = urllib.request.Request(
+            url=url,
+            method='POST',
+            headers={
+                "Content-Type": "application/json"
+            },
+            data=json.dumps({
                 'username': args.user,
                 'token': args.token,
                 'ipaddress': args.set_reverse,
                 'name': args.name,
                 'email': args.email,
                 'realm': args.realm
-            })
-        print(r.text)
+            }).encode('utf-8')
+        )
+        response = urllib.request.urlopen(req).read()
+        print(json.loads(response))