Index: head/math/mathics-django/Makefile =================================================================== --- head/math/mathics-django/Makefile (revision 566319) +++ head/math/mathics-django/Makefile (revision 566320) @@ -1,36 +1,37 @@ # Created by: Thierry Thomas # $FreeBSD$ PORTNAME= mathics-django -PORTVERSION= 2.0.0 +PORTVERSION= 2.0.1 CATEGORIES= math python MAINTAINER= thierry@FreeBSD.org COMMENT= Django front-end to Mathics LICENSE= GPLv3 BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Mathics>0:math/py-mathics@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django31>0:www/py-django31@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Mathics>0:math/py-mathics@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}django31>0:www/py-django31@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}django31>0:www/py-django31@${PY_FLAVOR}\ + ${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} USE_GITHUB= yes GH_ACCOUNT= Mathics3 USES= python:3.6+ readline shebangfix USE_PYTHON= distutils SHEBANG_GLOB= *.py MAKE_ENV+= PYTHON=${PYTHON_CMD} NO_ARCH= yes PLIST_SUB+= VER=${PORTVERSION} SUB_FILES= pkg-message SUB_LIST= PYTHON_CMD=${PYTHON_CMD} PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR} do-test: install (cd ${TEST_WRKSRC} && PYTHONPATH=${WRKSRC}/mathics_django DJANGO_SETTINGS_MODULE=settings py.test) .include Index: head/math/mathics-django/distinfo =================================================================== --- head/math/mathics-django/distinfo (revision 566319) +++ head/math/mathics-django/distinfo (revision 566320) @@ -1,3 +1,3 @@ -TIMESTAMP = 1613414610 -SHA256 (Mathics3-mathics-django-2.0.0_GH0.tar.gz) = 9ed12dad92d71e173be7928b9c7adcf81a7b341ae76fc59c408d143dc626d9b7 -SIZE (Mathics3-mathics-django-2.0.0_GH0.tar.gz) = 3228149 +TIMESTAMP = 1614015345 +SHA256 (Mathics3-mathics-django-2.0.1_GH0.tar.gz) = 6cfb7a58c688f36a26a0835f3263aacc917f3f2f11ce1ca86840730803481611 +SIZE (Mathics3-mathics-django-2.0.1_GH0.tar.gz) = 3207860 Index: head/math/mathics-django/files/patch-test_test__parser_test__convert.py =================================================================== --- head/math/mathics-django/files/patch-test_test__parser_test__convert.py (revision 566319) +++ head/math/mathics-django/files/patch-test_test__parser_test__convert.py (nonexistent) @@ -1,14 +0,0 @@ ---- test/test_parser/test_convert.py.orig 2021-02-15 21:52:59 UTC -+++ test/test_parser/test_convert.py -@@ -3,8 +3,9 @@ import random - import sys - - from mathics.core.definitions import Definitions --from mathics.core.parser import ( -- parse, InvalidSyntaxError, IncompleteSyntaxError, -+from mathics.core.parser import parse -+from mathics_scanner import ( -+ InvalidSyntaxError, IncompleteSyntaxError, - ScanError) - from mathics.core.parser.feed import SingleLineFeeder - from mathics.core.expression import ( Property changes on: head/math/mathics-django/files/patch-test_test__parser_test__convert.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/mathics-django/files/patch-test_test__parser_test__tokeniser.py =================================================================== --- head/math/mathics-django/files/patch-test_test__parser_test__tokeniser.py (revision 566319) +++ head/math/mathics-django/files/patch-test_test__parser_test__tokeniser.py (nonexistent) @@ -1,14 +0,0 @@ ---- test/test_parser/test_tokeniser.py.orig 2021-02-15 21:52:59 UTC -+++ test/test_parser/test_tokeniser.py -@@ -3,8 +3,9 @@ import unittest - import random - import sys - --from mathics.core.parser.tokeniser import Tokeniser, Token --from mathics.core.parser.errors import ScanError, IncompleteSyntaxError, InvalidSyntaxError -+from mathics_scanner import Tokeniser -+from mathics_scanner.tokeniser import Token -+from mathics_scanner import ScanError, IncompleteSyntaxError, InvalidSyntaxError - from mathics.core.parser.feed import SingleLineFeeder - - Property changes on: head/math/mathics-django/files/patch-test_test__parser_test__tokeniser.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/mathics-django/files/patch-test_test__parser_test__parser.py =================================================================== --- head/math/mathics-django/files/patch-test_test__parser_test__parser.py (revision 566319) +++ head/math/mathics-django/files/patch-test_test__parser_test__parser.py (nonexistent) @@ -1,11 +0,0 @@ ---- test/test_parser/test_parser.py.orig 2021-02-15 21:43:26 UTC -+++ test/test_parser/test_parser.py -@@ -6,7 +6,7 @@ import sys - import random - import unittest - --from mathics.core.parser.errors import ScanError, IncompleteSyntaxError, InvalidSyntaxError -+from mathics_scanner import ScanError, IncompleteSyntaxError, InvalidSyntaxError - from mathics.core.parser.ast import Node, Symbol, Number, String, Filename - from mathics.core.parser.feed import SingleLineFeeder - from mathics.core.parser.parser import Parser Property changes on: head/math/mathics-django/files/patch-test_test__parser_test__parser.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/mathics-django/files/patch-test_test__parser_test__util.py =================================================================== --- head/math/mathics-django/files/patch-test_test__parser_test__util.py (revision 566319) +++ head/math/mathics-django/files/patch-test_test__parser_test__util.py (nonexistent) @@ -1,12 +0,0 @@ ---- test/test_parser/test_util.py.orig 2021-02-15 21:52:59 UTC -+++ test/test_parser/test_util.py -@@ -1,7 +1,8 @@ - import unittest - - from mathics.core.definitions import Definitions --from mathics.core.parser import parse, InvalidSyntaxError, IncompleteSyntaxError -+from mathics.core.parser import parse -+from mathics_scanner import InvalidSyntaxError, IncompleteSyntaxError - from mathics.core.parser.feed import SingleLineFeeder, MultiLineFeeder - - Property changes on: head/math/mathics-django/files/patch-test_test__parser_test__util.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/mathics-django/files/patch-test_test__parser_test__prescanner.py =================================================================== --- head/math/mathics-django/files/patch-test_test__parser_test__prescanner.py (revision 566319) +++ head/math/mathics-django/files/patch-test_test__parser_test__prescanner.py (nonexistent) @@ -1,13 +0,0 @@ ---- test/test_parser/test_prescanner.py.orig 2021-02-15 21:52:59 UTC -+++ test/test_parser/test_prescanner.py -@@ -1,8 +1,8 @@ - - import unittest - --from mathics.core.parser import IncompleteSyntaxError, ScanError --from mathics.core.parser.prescanner import Prescanner -+from mathics_scanner import IncompleteSyntaxError, ScanError -+from mathics_scanner.prescanner import Prescanner - from mathics.core.parser.feed import SingleLineFeeder - - Property changes on: head/math/mathics-django/files/patch-test_test__parser_test__prescanner.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/mathics-django/files/pkg-message.in =================================================================== --- head/math/mathics-django/files/pkg-message.in (revision 566319) +++ head/math/mathics-django/files/pkg-message.in (revision 566320) @@ -1,2 +1,2 @@ To run the server, type: -%%PYTHON_CMD%% %%PYTHON_SITELIBDIR%%/mathics-django/manage.py runserver +%%PYTHON_CMD%% %%PYTHON_SITELIBDIR%%/mathics_django/manage.py runserver