Remove CallableBool and Tests have been update to reflect code changes

Author: ngocngoan

Makefile

@@ -1,85 +1,68 @@
-.PHONY: clean clean-test clean-pyc clean-build docs help
-.DEFAULT_GOAL := help
+.PHONY: clean
+clean: clean-build clean-pyc
 
-define BROWSER_PYSCRIPT
-import os, webbrowser, sys
-
-from urllib.request import pathname2url
-
-webbrowser.open("file://" + pathname2url(os.path.abspath(sys.argv[1])))
-endef
-export BROWSER_PYSCRIPT
-
-define PRINT_HELP_PYSCRIPT
-import re, sys
-
-for line in sys.stdin:
-	match = re.match(r'^([a-zA-Z_-]+):.*?## (.*)$$', line)
-	if match:
-		target, help = match.groups()
-		print("%-20s %s" % (target, help))
-endef
-export PRINT_HELP_PYSCRIPT
-
-BROWSER := python -c "$$BROWSER_PYSCRIPT"
-
-help:
-	@python -c "$$PRINT_HELP_PYSCRIPT" < $(MAKEFILE_LIST)
-
-clean: clean-build clean-pyc clean-test ## remove all build, test, coverage and Python artifacts
-
-clean-build: ## remove build artifacts
+.PHONY: clean-build
+clean-build:
 	rm -fr build/
 	rm -fr dist/
-	rm -fr .eggs/
-	find . -name '*.egg-info' -exec rm -fr {} +
-	find . -name '*.egg' -exec rm -f {} +
+	rm -fr *.egg-info
 
-clean-pyc: ## remove Python file artifacts
+.PHONY: clean-pyc
+clean-pyc:
 	find . -name '*.pyc' -exec rm -f {} +
 	find . -name '*.pyo' -exec rm -f {} +
 	find . -name '*~' -exec rm -f {} +
-	find . -name '__pycache__' -exec rm -fr {} +
 
-clean-test: ## remove test and coverage artifacts
-	rm -fr .tox/
-	rm -f .coverage
-	rm -fr htmlcov/
-	rm -fr .pytest_cache
+.PHONY: lint
+lint:
+	tox -e lint
 
-lint: ## check style with flake8
-	flake8 rest_framework_simplejwt_mongoengine tests
+.PHONY: lint-roll
+lint-roll:
+	isort rest_framework_simplejwt_mongoengine tests
+	$(MAKE) lint
 
-test: ## run tests quickly with the default Python
-	pytest
+.PHONY: tests
+test:
+	pytest tests
 
-test-all: ## run tests on every Python version with tox
+.PHONY: test-all
+test-all:
 	tox
 
-coverage: ## check code coverage quickly with the default Python
-	coverage run --source rest_framework_simplejwt_mongoengine -m pytest
-	coverage report -m
-	coverage html
-	$(BROWSER) htmlcov/index.html
-
-docs: ## generate Sphinx HTML documentation, including API docs
-	rm -f docs/rest_framework_simplejwt_mongoengine.rst
-	rm -f docs/modules.rst
-	sphinx-apidoc -o docs/ rest_framework_simplejwt_mongoengine
+.PHONY: build-docs
+build-docs:
+	sphinx-apidoc -o docs/ . \
+		setup.py \
+		*confest* \
+		tests/* \
+		rest_framework_simplejwt_mongoengine/token_blacklist/* \
+		rest_framework_simplejwt_mongoengine/backends.py \
+		rest_framework_simplejwt_mongoengine/exceptions.py \
+		rest_framework_simplejwt_mongoengine/settings.py \
+		rest_framework_simplejwt_mongoengine/state.py
 	$(MAKE) -C docs clean
 	$(MAKE) -C docs html
-	$(BROWSER) docs/_build/html/index.html
+	$(MAKE) -C docs doctest
 
-servedocs: docs ## compile the docs watching for changes
-	watchmedo shell-command -p '*.rst' -c '$(MAKE) -C docs html' -R -D .
+.PHONY: docs
+docs: build-docs
+	open docs/_build/html/index.html
 
-release: dist ## package and upload a release
+.PHONY: linux-docs
+linux-docs: build-docs
+	xdg-open docs/_build/html/index.html
+
+.PHONY: pushversion
+pushversion:
+	git push upstream && git push upstream --tags
+
+.PHONY: publish
+publish:
+	python setup.py sdist bdist_wheel
 	twine upload dist/*
 
-dist: clean ## builds source and wheel package
-	python setup.py sdist
-	python setup.py bdist_wheel
+.PHONY: dist
+dist: clean
+	python setup.py sdist bdist_wheel
 	ls -l dist
-
-install: clean ## install the package to the active Python's site-packages
-	python setup.py install

rest_framework_simplejwt_mongoengine/compat.py

@@ -1,6 +1,5 @@
 from django.utils.functional import cached_property
 
-from .compat import CallableFalse, CallableTrue
 from .settings import api_settings
 
 
@@ -82,11 +81,11 @@ def has_module_perms(self, module):
 
     @property
     def is_anonymous(self):
-        return CallableFalse
+        return False
 
     @property
     def is_authenticated(self):
-        return CallableTrue
+        return True
 
     def get_username(self):
         return self.username

rest_framework_simplejwt_mongoengine/models.py

@@ -1,8 +1,8 @@
 from datetime import timedelta
 
+from django.urls import reverse
 from django_mongoengine.mongo_auth.managers import get_user_document
 
-from rest_framework_simplejwt_mongoengine.compat import reverse
 from rest_framework_simplejwt_mongoengine.settings import api_settings
 from rest_framework_simplejwt_mongoengine.tokens import AccessToken
 

tests/test_integration.py

@@ -1,10 +1,10 @@
 import contextlib
 
 from django.test import TestCase
+from django.urls import reverse
 from mongoengine.connection import get_db
 from rest_framework.test import APIClient
 
-from rest_framework_simplejwt_mongoengine.compat import reverse
 from rest_framework_simplejwt_mongoengine.settings import api_settings