summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Morgan <jesse@jesterpm.net>2023-01-21 09:34:39 -0800
committerJesse Morgan <jesse@jesterpm.net>2023-01-21 09:53:11 -0800
commitb38e259457fe68003f4d8e8eaffb17ee985eb013 (patch)
tree3a82c4a708a34a2e18ec0be3f8347c35ca330607
parentfbcfa91c84aa4bb8105b5630152f2369b6d82281 (diff)
Missing python3 changes
-rw-r--r--Makefile6
-rw-r--r--requirements.txt3
-rw-r--r--setup.py2
-rw-r--r--tests/test_canarydb.py6
4 files changed, 9 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index cae60cc..f6e7098 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
-PYTHON=`which python`
-NAME=`python setup.py --name`
+PYTHON=`which python3`
+NAME=`python3 setup.py --name`
all: check test source
init:
- pip install -r requirements.txt --use-mirrors
+ pip3 install -r requirements.txt
dist: source deb
diff --git a/requirements.txt b/requirements.txt
index c36aac9..209a57d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,5 @@
setuptools
pylint
unittest2
-mock \ No newline at end of file
+mock
+stdeb
diff --git a/setup.py b/setup.py
index fbc1a84..da0c698 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
from setuptools import setup, find_packages
setup(name='emailcanary',
diff --git a/tests/test_canarydb.py b/tests/test_canarydb.py
index 195387e..47bdc52 100644
--- a/tests/test_canarydb.py
+++ b/tests/test_canarydb.py
@@ -16,7 +16,7 @@ class TestCanaryDB(unittest.TestCase):
def testPingCheckPong(self):
listAddress = "list@example.com"
address = "test@example.com"
- time = datetime.datetime(2015, 10, 24, 9, 00)
+ time = datetime.datetime(2015, 10, 24, 9, 0)
uuid = "1234"
expectedDelta = datetime.datetime.now() - time
@@ -36,7 +36,7 @@ class TestCanaryDB(unittest.TestCase):
self.assertTrue(delta <= 10)
# Record a pong
- pongtime = datetime.datetime(2015, 10, 24, 9, 05)
+ pongtime = datetime.datetime(2015, 10, 24, 9, 5)
self.db.pong(address, pongtime, uuid)
# Check for missing pongs
@@ -46,7 +46,7 @@ class TestCanaryDB(unittest.TestCase):
def testCloseReopen(self):
listAddress = "list@example.com"
address = "test@example.com"
- time = datetime.datetime(2015, 10, 24, 9, 00)
+ time = datetime.datetime(2015, 10, 24, 9, 0)
uuid = "1234"
expectedDelta = datetime.datetime.now() - time