Switch to Pytest / update Python versions (#15)

* Switch to pytest

* Drop 2.7

Author: AntoineAugusti

.circleci/config.yml

@@ -2,9 +2,12 @@ workflows:
   version: 2
   test:
     jobs:
-      - test-2.7
       - test-3.5
       - test-3.6
+      - test-3.7
+      - test-3.8
+      - test-3.9
+      - test-3.10
       - test-latest
 jobs:
   test-3.6: &test-template
@@ -29,7 +32,7 @@ jobs:
       - run:
           name: Install dependencies
           command: |
-            python -m venv venv || virtualenv -p /usr/bin/python2.7 venv
+            python -m venv venv
             . venv/bin/activate
             pip install -e .[dev]
       - save_cache:
@@ -41,19 +44,37 @@ jobs:
           name: Run test suite
           command: |
             . venv/bin/activate
-            nosetests .
+            pytest
   test-3.5:
     <<: *test-template
     docker:
       - image: circleci/python:3.5
     environment:
       PYTHON_VERSION=3.5
-  test-2.7:
+  test-3.7:
     <<: *test-template
     docker:
-      - image: circleci/python:2.7
+      - image: circleci/python:3.7
     environment:
-      PYTHON_VERSION=2.7
+      PYTHON_VERSION=3.7
+  test-3.8:
+    <<: *test-template
+    docker:
+      - image: circleci/python:3.8
+    environment:
+      PYTHON_VERSION=3.8
+  test-3.9:
+    <<: *test-template
+    docker:
+      - image: circleci/python:3.9
+    environment:
+      PYTHON_VERSION=3.9
+  test-3.10:
+    <<: *test-template
+    docker:
+      - image: circleci/python:3.10
+    environment:
+      PYTHON_VERSION=3.10
   test-latest:
     <<: *test-template
     docker:

setup.py

@@ -19,7 +19,7 @@
         "holiday",
         "calendar",
     ],
-    extras_require={"dev": ["nose"]},
+    extras_require={"dev": ["pytest"]},
     package_data={"vacances_scolaires_france": ["data/data.csv"]},
     python_requires=">=2.7, <4",
     long_description=open("README.md", encoding="utf-8").read(),

tests/test_init.py

@@ -26,12 +26,10 @@ def test_is_holiday(self):
         self.assertTrue(d.is_holiday(datetime.date(2017, 12, 25)))
         self.assertFalse(d.is_holiday(datetime.date(2017, 12, 1)))
 
-        with self.assertRaisesRegexp(
-            UnsupportedYearException, "No data for year: 1985"
-        ):
+        with self.assertRaisesRegex(UnsupportedYearException, "No data for year: 1985"):
             d.is_holiday(datetime.date(1985, 2, 7))
 
-        with self.assertRaisesRegexp(ValueError, "date should be a datetime.date"):
+        with self.assertRaisesRegex(ValueError, "date should be a datetime.date"):
             d.is_holiday(datetime.datetime(2017, 12, 1, 2, 0))
 
     def test_is_holiday_for_zone(self):
@@ -43,38 +41,34 @@ def test_is_holiday_for_zone(self):
         self.assertFalse(d.is_holiday_for_zone(datetime.date(2009, 3, 7), "A"))
         self.assertFalse(d.is_holiday_for_zone(datetime.date(2009, 6, 7), "A"))
 
-        with self.assertRaisesRegexp(
-            UnsupportedYearException, "No data for year: 1985"
-        ):
+        with self.assertRaisesRegex(UnsupportedYearException, "No data for year: 1985"):
             d.is_holiday_for_zone(datetime.date(1985, 2, 7), "D")
-        with self.assertRaisesRegexp(UnsupportedZoneException, "Unsupported zone: D"):
+        with self.assertRaisesRegex(UnsupportedZoneException, "Unsupported zone: D"):
             self.assertFalse(d.is_holiday_for_zone(datetime.date(2009, 2, 7), "D"))
-        with self.assertRaisesRegexp(ValueError, "date should be a datetime.date"):
+        with self.assertRaisesRegex(ValueError, "date should be a datetime.date"):
             d.is_holiday_for_zone(datetime.datetime(2017, 12, 1, 2, 0), "A")
 
     def test_holidays_for_year(self):
         d = SchoolHolidayDates()
 
         res = d.holidays_for_year(2018)
 
-        self.assertEquals(len(res), 151)
+        self.assertEqual(len(res), 151)
 
         for k, v in res.items():
-            self.assertEquals(sorted(v.keys()), self.EXPECTED_KEYS)
+            self.assertEqual(sorted(v.keys()), self.EXPECTED_KEYS)
 
-        with self.assertRaisesRegexp(
-            UnsupportedYearException, "No data for year: 2027"
-        ):
-            self.assertEquals({}, d.holidays_for_year(2027))
+        with self.assertRaisesRegex(UnsupportedYearException, "No data for year: 2027"):
+            self.assertEqual({}, d.holidays_for_year(2027))
 
     def test_holiday_for_year_by_name(self):
         d = SchoolHolidayDates()
 
         res = d.holiday_for_year_by_name(2017, "Vacances de la Toussaint")
 
-        self.assertEquals(len(res), 16)
+        self.assertEqual(len(res), 16)
         for k, v in res.items():
-            self.assertEquals(sorted(v.keys()), self.EXPECTED_KEYS)
+            self.assertEqual(sorted(v.keys()), self.EXPECTED_KEYS)
         expected_dates = [
             self.parse_date(date)
             for date in [
@@ -96,47 +90,43 @@ def test_holiday_for_year_by_name(self):
                 "2017-11-05",
             ]
         ]
-        self.assertEquals(sorted([v["date"] for v in res.values()]), expected_dates)
+        self.assertEqual(sorted([v["date"] for v in res.values()]), expected_dates)
 
-        with self.assertRaisesRegexp(
-            UnsupportedYearException, "No data for year: 1985"
-        ):
-            self.assertEquals(
+        with self.assertRaisesRegex(UnsupportedYearException, "No data for year: 1985"):
+            self.assertEqual(
                 {}, d.holiday_for_year_by_name(1985, "Vacances de la Toussaint")
             )
 
-        with self.assertRaisesRegexp(
+        with self.assertRaisesRegex(
             UnsupportedHolidayException, "Unknown holiday name: Foo"
         ):
-            self.assertEquals({}, d.holiday_for_year_by_name(2017, "Foo"))
+            self.assertEqual({}, d.holiday_for_year_by_name(2017, "Foo"))
 
     def test_holidays_for_year_and_zone(self):
         d = SchoolHolidayDates()
 
         res = d.holidays_for_year_and_zone(2017, "A")
 
-        self.assertEquals(len(res), 118)
+        self.assertEqual(len(res), 118)
         for k, v in res.items():
-            self.assertEquals(sorted(v.keys()), self.EXPECTED_KEYS)
+            self.assertEqual(sorted(v.keys()), self.EXPECTED_KEYS)
 
             self.assertTrue(v["vacances_zone_a"])
 
-        with self.assertRaisesRegexp(
-            UnsupportedYearException, "No data for year: 1985"
-        ):
+        with self.assertRaisesRegex(UnsupportedYearException, "No data for year: 1985"):
             self.assertFalse(d.holidays_for_year_and_zone(1985, "D"))
 
-        with self.assertRaisesRegexp(UnsupportedZoneException, "Unsupported zone: D"):
+        with self.assertRaisesRegex(UnsupportedZoneException, "Unsupported zone: D"):
             self.assertFalse(d.holidays_for_year_and_zone(2017, "D"))
 
     def test_holidays_for_year_zone_and_name(self):
         d = SchoolHolidayDates()
 
         res = d.holidays_for_year_zone_and_name(2017, "A", "Vacances de printemps")
-        self.assertEquals(len(res), 17)
+        self.assertEqual(len(res), 17)
 
         for k, v in res.items():
-            self.assertEquals(sorted(v.keys()), self.EXPECTED_KEYS)
+            self.assertEqual(sorted(v.keys()), self.EXPECTED_KEYS)
         expected_dates = [
             self.parse_date(date)
             for date in [
@@ -159,17 +149,15 @@ def test_holidays_for_year_zone_and_name(self):
                 "2017-05-01",
             ]
         ]
-        self.assertEquals(sorted([v["date"] for v in res.values()]), expected_dates)
+        self.assertEqual(sorted([v["date"] for v in res.values()]), expected_dates)
 
-        with self.assertRaisesRegexp(
-            UnsupportedYearException, "No data for year: 1985"
-        ):
+        with self.assertRaisesRegex(UnsupportedYearException, "No data for year: 1985"):
             d.holidays_for_year_zone_and_name(1985, "A", "Vacances de printemps")
 
-        with self.assertRaisesRegexp(UnsupportedZoneException, "Unsupported zone: D"):
+        with self.assertRaisesRegex(UnsupportedZoneException, "Unsupported zone: D"):
             d.holidays_for_year_zone_and_name(2017, "D", "Vacances de printemps")
 
-        with self.assertRaisesRegexp(
+        with self.assertRaisesRegex(
             UnsupportedHolidayException, "Unknown holiday name: Foo"
         ):
             d.holidays_for_year_zone_and_name(2017, "A", "Foo")
@@ -184,4 +172,4 @@ def test_supported_holidays_are_complete(self):
             names.add(v["nom_vacances"])
 
         expected = set(SchoolHolidayDates.SUPPORTED_HOLIDAY_NAMES)
-        self.assertEquals(names, expected)
+        self.assertEqual(names, expected)