#273: Remove nose dependency for bit_manipulation/ (#279)

donnemartin · Jul 12, 2020 · dce6b6a · dce6b6a
1 parent d488e4f
commit dce6b6a
Show file tree

Hide file tree

Showing 24 changed files with 242 additions and 324 deletions.
diff --git a/bit_manipulation/bit/bit_challenge.ipynb b/bit_manipulation/bit/bit_challenge.ipynb
@@ -92,9 +92,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "class Bit(object):\n",
@@ -145,40 +143,38 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "# %load test_bit.py\n",
-    "from nose.tools import assert_equal\n",
+    "import unittest\n",
     "\n",
     "\n",
-    "class TestBit(object):\n",
+    "class TestBit(unittest.TestCase):\n",
     "\n",
     "    def test_bit(self):\n",
     "        number = int('10001110', base=2)\n",
     "        bit = Bit(number)\n",
-    "        assert_equal(bit.get_bit(index=3), True)\n",
+    "        self.assertEqual(bit.get_bit(index=3), True)\n",
     "        expected = int('10011110', base=2)\n",
-    "        assert_equal(bit.set_bit(index=4), expected)\n",
+    "        self.assertEqual(bit.set_bit(index=4), expected)\n",
     "        bit = Bit(number)\n",
     "        expected = int('10000110', base=2)\n",
-    "        assert_equal(bit.clear_bit(index=3), expected)\n",
+    "        self.assertEqual(bit.clear_bit(index=3), expected)\n",
     "        bit = Bit(number)\n",
     "        expected = int('00000110', base=2)\n",
-    "        assert_equal(bit.clear_bits_msb_to_index(index=3), expected)\n",
+    "        self.assertEqual(bit.clear_bits_msb_to_index(index=3), expected)\n",
     "        bit = Bit(number)\n",
     "        expected = int('10000000', base=2)\n",
-    "        assert_equal(bit.clear_bits_index_to_lsb(index=3), expected)\n",
+    "        self.assertEqual(bit.clear_bits_index_to_lsb(index=3), expected)\n",
     "        bit = Bit(number)\n",
-    "        assert_equal(bit.update_bit(index=3, value=1), number)\n",
+    "        self.assertEqual(bit.update_bit(index=3, value=1), number)\n",
     "        bit = Bit(number)\n",
     "        expected = int('10000110', base=2)\n",
-    "        assert_equal(bit.update_bit(index=3, value=0), expected)\n",
+    "        self.assertEqual(bit.update_bit(index=3, value=0), expected)\n",
     "        bit = Bit(number)\n",
     "        expected = int('10001111', base=2)\n",
-    "        assert_equal(bit.update_bit(index=0, value=1), expected)\n",
+    "        self.assertEqual(bit.update_bit(index=0, value=1), expected)\n",
     "        print('Success: test_bit')\n",
     "\n",
     "\n",
@@ -217,9 +213,9 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.5.0"
+   "version": "3.7.2"
   }
  },
  "nbformat": 4,
- "nbformat_minor": 0
+ "nbformat_minor": 1
 }
diff --git a/bit_manipulation/bit/bit_solution.ipynb b/bit_manipulation/bit/bit_solution.ipynb
@@ -179,9 +179,7 @@
   {
    "cell_type": "code",
    "execution_count": 1,
-   "metadata": {
-    "collapsed": true
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "def validate_index(func):\n",
@@ -196,9 +194,7 @@
   {
    "cell_type": "code",
    "execution_count": 2,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "class Bit(object):\n",
@@ -260,9 +256,7 @@
   {
    "cell_type": "code",
    "execution_count": 3,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [
     {
      "name": "stdout",
@@ -274,34 +268,34 @@
    ],
    "source": [
     "%%writefile test_bit.py\n",
-    "from nose.tools import assert_equal\n",
+    "import unittest\n",
     "\n",
     "\n",
-    "class TestBit(object):\n",
+    "class TestBit(unittest.TestCase):\n",
     "\n",
     "    def test_bit(self):\n",
     "        number = int('10001110', base=2)\n",
     "        bit = Bit(number)\n",
-    "        assert_equal(bit.get_bit(index=3), True)\n",
+    "        self.assertEqual(bit.get_bit(index=3), True)\n",
     "        expected = int('10011110', base=2)\n",
-    "        assert_equal(bit.set_bit(index=4), expected)\n",
+    "        self.assertEqual(bit.set_bit(index=4), expected)\n",
     "        bit = Bit(number)\n",
     "        expected = int('10000110', base=2)\n",
-    "        assert_equal(bit.clear_bit(index=3), expected)\n",
+    "        self.assertEqual(bit.clear_bit(index=3), expected)\n",
     "        bit = Bit(number)\n",
     "        expected = int('00000110', base=2)\n",
-    "        assert_equal(bit.clear_bits_msb_to_index(index=3), expected)\n",
+    "        self.assertEqual(bit.clear_bits_msb_to_index(index=3), expected)\n",
     "        bit = Bit(number)\n",
     "        expected = int('10000000', base=2)\n",
-    "        assert_equal(bit.clear_bits_index_to_lsb(index=3), expected)\n",
+    "        self.assertEqual(bit.clear_bits_index_to_lsb(index=3), expected)\n",
     "        bit = Bit(number)\n",
-    "        assert_equal(bit.update_bit(index=3, value=1), number)\n",
+    "        self.assertEqual(bit.update_bit(index=3, value=1), number)\n",
     "        bit = Bit(number)\n",
     "        expected = int('10000110', base=2)\n",
-    "        assert_equal(bit.update_bit(index=3, value=0), expected)\n",
+    "        self.assertEqual(bit.update_bit(index=3, value=0), expected)\n",
     "        bit = Bit(number)\n",
     "        expected = int('10001111', base=2)\n",
-    "        assert_equal(bit.update_bit(index=0, value=1), expected)\n",
+    "        self.assertEqual(bit.update_bit(index=0, value=1), expected)\n",
     "        print('Success: test_bit')\n",
     "\n",
     "\n",
@@ -317,9 +311,7 @@
   {
    "cell_type": "code",
    "execution_count": 4,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [
     {
      "name": "stdout",
@@ -350,9 +342,9 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.5.0"
+   "version": "3.7.2"
   }
  },
  "nbformat": 4,
- "nbformat_minor": 0
+ "nbformat_minor": 1
 }
diff --git a/bit_manipulation/bit/test_bit.py b/bit_manipulation/bit/test_bit.py
@@ -1,31 +1,31 @@
-from nose.tools import assert_equal
+import unittest
 
 
-class TestBit(object):
+class TestBit(unittest.TestCase):
 
     def test_bit(self):
         number = int('10001110', base=2)
         bit = Bit(number)
-        assert_equal(bit.get_bit(index=3), True)
+        self.assertEqual(bit.get_bit(index=3), True)
         expected = int('10011110', base=2)
-        assert_equal(bit.set_bit(index=4), expected)
+        self.assertEqual(bit.set_bit(index=4), expected)
         bit = Bit(number)
         expected = int('10000110', base=2)
-        assert_equal(bit.clear_bit(index=3), expected)
+        self.assertEqual(bit.clear_bit(index=3), expected)
         bit = Bit(number)
         expected = int('00000110', base=2)
-        assert_equal(bit.clear_bits_msb_to_index(index=3), expected)
+        self.assertEqual(bit.clear_bits_msb_to_index(index=3), expected)
         bit = Bit(number)
         expected = int('10000000', base=2)
-        assert_equal(bit.clear_bits_index_to_lsb(index=3), expected)
+        self.assertEqual(bit.clear_bits_index_to_lsb(index=3), expected)
         bit = Bit(number)
-        assert_equal(bit.update_bit(index=3, value=1), number)
+        self.assertEqual(bit.update_bit(index=3, value=1), number)
         bit = Bit(number)
         expected = int('10000110', base=2)
-        assert_equal(bit.update_bit(index=3, value=0), expected)
+        self.assertEqual(bit.update_bit(index=3, value=0), expected)
         bit = Bit(number)
         expected = int('10001111', base=2)
-        assert_equal(bit.update_bit(index=0, value=1), expected)
+        self.assertEqual(bit.update_bit(index=0, value=1), expected)
         print('Success: test_bit')
 
 
@@ -35,4 +35,4 @@ def main():
 
 
 if __name__ == '__main__':
-    main()
+    main()
diff --git a/bit_manipulation/bits_to_flip/bits_to_flip_challenge.ipynb b/bit_manipulation/bits_to_flip/bits_to_flip_challenge.ipynb
@@ -80,9 +80,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "class Bits(object):\n",
@@ -109,23 +107,21 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "# %load test_bits_to_flip.py\n",
-    "from nose.tools import assert_equal\n",
+    "import unittest\n",
     "\n",
     "\n",
-    "class TestBits(object):\n",
+    "class TestBits(unittest.TestCase):\n",
     "\n",
     "    def test_bits_to_flip(self):\n",
     "        bits = Bits()\n",
     "        a = int('11101', base=2)\n",
     "        b = int('01111', base=2)\n",
     "        expected = 2\n",
-    "        assert_equal(bits.bits_to_flip(a, b), expected)\n",
+    "        self.assertEqual(bits.bits_to_flip(a, b), expected)\n",
     "        print('Success: test_bits_to_flip')\n",
     "\n",
     "\n",
@@ -164,9 +160,9 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.5.0"
+   "version": "3.7.2"
   }
  },
  "nbformat": 4,
- "nbformat_minor": 0
+ "nbformat_minor": 1
 }
diff --git a/bit_manipulation/bits_to_flip/bits_to_flip_solution.ipynb b/bit_manipulation/bits_to_flip/bits_to_flip_solution.ipynb
@@ -91,9 +91,7 @@
   {
    "cell_type": "code",
    "execution_count": 1,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "class Bits(object):\n",
@@ -119,9 +117,7 @@
   {
    "cell_type": "code",
    "execution_count": 2,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [
     {
      "name": "stdout",
@@ -133,17 +129,17 @@
    ],
    "source": [
     "%%writefile test_bits_to_flip.py\n",
-    "from nose.tools import assert_equal\n",
+    "import unittest\n",
     "\n",
     "\n",
-    "class TestBits(object):\n",
+    "class TestBits(unittest.TestCase):\n",
     "\n",
     "    def test_bits_to_flip(self):\n",
     "        bits = Bits()\n",
     "        a = int('11101', base=2)\n",
     "        b = int('01111', base=2)\n",
     "        expected = 2\n",
-    "        assert_equal(bits.bits_to_flip(a, b), expected)\n",
+    "        self.assertEqual(bits.bits_to_flip(a, b), expected)\n",
     "        print('Success: test_bits_to_flip')\n",
     "\n",
     "\n",
@@ -159,9 +155,7 @@
   {
    "cell_type": "code",
    "execution_count": 3,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [
     {
      "name": "stdout",
@@ -192,9 +186,9 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.5.0"
+   "version": "3.7.2"
   }
  },
  "nbformat": 4,
- "nbformat_minor": 0
+ "nbformat_minor": 1
 }
diff --git a/bit_manipulation/bits_to_flip/test_bits_to_flip.py b/bit_manipulation/bits_to_flip/test_bits_to_flip.py
@@ -1,14 +1,14 @@
-from nose.tools import assert_equal
+import unittest
 
 
-class TestBits(object):
+class TestBits(unittest.TestCase):
 
     def test_bits_to_flip(self):
         bits = Bits()
         a = int('11101', base=2)
         b = int('01111', base=2)
         expected = 2
-        assert_equal(bits.bits_to_flip(a, b), expected)
+        self.assertEqual(bits.bits_to_flip(a, b), expected)
         print('Success: test_bits_to_flip')
 
 
@@ -18,4 +18,4 @@ def main():
 
 
 if __name__ == '__main__':
-    main()
+    main()