Merge pull request #173 from maxmind/sromani/remove-mocket

oschwald · web-flow · commit 910f3207c35d · 2024-07-16T07:38:44.000-07:00
Remove mocket
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -11,8 +11,7 @@ jobs:
 
     strategy:
       matrix:
-        # We don't test on Windows currently as it appears mocket may not
-        # work there.
+        # TODO: add windows-latest also
         platform: [ubuntu-latest, macos-latest]
         python-version: [3.8, 3.9, "3.10", 3.11, 3.12]
 
diff --git a/.gitignore b/.gitignore
@@ -19,3 +19,4 @@ pylint.txt
 *.swp
 .tox
 violations.pyflakes.txt
+/venv
diff --git a/pyproject.toml b/pyproject.toml
@@ -36,7 +36,7 @@ classifiers = [
 
 [project.optional-dependencies]
 test = [
-    "mocket>=3.12.8",
+    "pytest-httpserver>=1.0.10",
 ]
 
 [tool.setuptools.package-data]
diff --git a/setup.cfg b/setup.cfg
@@ -21,7 +21,7 @@ python =
 
 [testenv:{py38,py39,py310,py311,py312}-test]
 deps =
-    mocket
+    pytest-httpserver
     pytest
 commands = pytest tests
 
@@ -40,6 +40,8 @@ commands = flake8 geoip2
 [testenv:py312-mypy]
 deps =
     mypy
+    pytest_httpserver
+    pytest
     types-requests
     voluptuous-stubs
 commands = mypy geoip2 tests
diff --git a/tests/webservice_test.py b/tests/webservice_test.py

-Original file line number
+Diff line change
 *.swp
 .tox
 violations.pyflakes.txt
 +/venv
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ classifiers = [`
`36`	`36`
`37`	`37`	`[project.optional-dependencies]`
`38`	`38`	`test = [`
`39`		`- "mocket>=3.12.8",`
	`39`	`+ "pytest-httpserver>=1.0.10",`
`40`	`40`	`]`
`41`	`41`
`42`	`42`	`[tool.setuptools.package-data]`