diff --git a/www/py-flask-caching/Makefile b/www/py-flask-caching/Makefile index f8f71cf..791c834 100644 --- a/www/py-flask-caching/Makefile +++ b/www/py-flask-caching/Makefile @@ -1,7 +1,7 @@ -# $FreeBSD$ +# created by Rene Thuemmler PORTNAME= Flask-Caching -PORTVERSION= 1.8.0 +PORTVERSION= 1.9.0 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.8:www/py-flask@${PY_FLAVOR} -USES= python:3.5+ +USES= python:3.6+ USE_PYTHON= autoplist distutils .include diff --git a/www/py-isso/Makefile b/www/py-isso/Makefile index ce03bdc..056678e 100644 --- a/www/py-isso/Makefile +++ b/www/py-isso/Makefile @@ -1,7 +1,7 @@ -# $FreeBSD$ +# created by Rene Thuemmler PORTNAME= isso -DISTVERSION= g20200524 +DISTVERSION= 0.12.6 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,9 +13,9 @@ LICENSE= MIT LICENSE_FILE= $(WRKSRC)/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}bleach>0:www/py-bleach@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}bleach>0:www/py-bleach@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}werkzeug>=1.0.0:www/py-werkzeug@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}Flask-Caching>=1.7.0<1.9.0:www/py-flask-caching@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Flask-Caching>=1.9.0:www/py-flask-caching@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}misaka>=2.0<3.0:textproc/py-misaka@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}itsdangerous>0:security/py-itsdangerous@${PY_FLAVOR} \ @@ -27,19 +27,17 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>1.3.0:devel/py-cffi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ git>2:devel/git \ - npm>0:www/npm + npm>0:www/npm \ + sassc>0:textproc/sassc -USES= gmake python:3.5+ +USES= gmake python:3.4+ USE_PYTHON= autoplist distutils USE_GITHUB= yes GH_ACCOUNT= posativ -GH_PROJECT= ${PORTNAME} -GH_TAGNAME= 56ada5ca +GH_TAGNAME= 9e021cb6 ALL_TARGET= init man js -MAKEFILE= ${FILESDIR}/Makefile.in - MAKE_JOBS_UNSAFE= no USERS= www diff --git a/www/py-isso/distinfo b/www/py-isso/distinfo index 272baa0..463b37a 100644 --- a/www/py-isso/distinfo +++ b/www/py-isso/distinfo @@ -1,2 +1,2 @@ -SHA256 (posativ-isso-g20200524-56ada5ca_GH0.tar.gz) = b082096cc073bb7c05a768a0aa28419aafd9f151db01662c8babf0450fd55eaa -SIZE (posativ-isso-g20200524-56ada5ca_GH0.tar.gz) = 181982 +SHA256 (posativ-isso-0.12.6-9e021cb6_GH0.tar.gz) = 400602b898eb0d89372fe7b6180a4bd8994de360b83968e9731607fe16188a3a +SIZE (posativ-isso-0.12.6-9e021cb6_GH0.tar.gz) = 186555 diff --git a/www/py-isso/files/Makefile.in b/www/py-isso/files/Makefile.in deleted file mode 100644 index ff496ce..0000000 --- a/www/py-isso/files/Makefile.in +++ /dev/null @@ -1,78 +0,0 @@ -# INSTALLATION: pip install sphinx && npm install --global node-sass - -FLAKE_IGNORE=E226,E241,E265,E402,E501,E704 - -ISSO_JS_SRC := $(shell find isso/js/app -type f) \ - $(shell ls isso/js/*.js | grep -vE "(min|dev)") \ - isso/js/lib/requirejs-jade/jade.js - -ISSO_JS_DST := isso/js/embed.min.js isso/js/embed.dev.js \ - isso/js/count.min.js isso/js/count.dev.js - -ISSO_CSS := isso/css/isso.css - -ISSO_PY_SRC := $(shell git ls-files | grep -E "^isso/.+.py$$") - -DOCS_RST_SRC := $(shell find docs/ -type f -name '*.rst') \ - $(wildcard docs/_isso/*) \ - docs/index.html docs/conf.py docs/docutils.conf \ - share/isso.conf - -DOCS_CSS_SRC := docs/_static/css/site.scss - -DOCS_CSS_DEP := $(shell find docs/_static/css/neat -type f) \ - $(shell find docs/_static/css/bourbon -type f) - -DOCS_CSS_DST := docs/_static/css/site.css - -DOCS_MAN_DST := man/man1/isso.1 man/man5/isso.conf.5 - -DOCS_HTML_DST := docs/_build/html - -RJS = ./node_modules/requirejs/bin/r.js - -SASS = node-sass - -all: init js - -init: - npm install bower requirejs uglify-js jade && cp package-lock.json package.json - cd isso/js && ../../node_modules/bower/bin/bower --allow-root install almond requirejs requirejs-text jade - -flakes: - flake8 . --count --ignore=${FLAKE_IGNORE} --max-line-length=127 --show-source --statistics - -isso/js/%.min.js: $(ISSO_JS_SRC) $(ISSO_CSS) - $(RJS) -o isso/js/build.$*.js out=$@ - -isso/js/%.dev.js: $(ISSO_JS_SRC) $(ISSO_CSS) - $(RJS) -o isso/js/build.$*.js optimize="none" out=$@ - -js: $(ISSO_JS_DST) - -man: $(DOCS_RST_SRC) - sphinx-build -b man docs/ man/ - mkdir -p man/man1/ man/man5 - mv man/isso.1 man/man1/isso.1 - mv man/isso.conf.5 man/man5/isso.conf.5 - -${DOCS_CSS_DST}: $(DOCS_CSS_SRC) $(DOCS_CSS_DEP) - $(SASS) --no-cache $(DOCS_CSS_SRC) $@ - -${DOCS_HTML_DST}: $(DOCS_RST_SRC) $(DOCS_CSS_DST) - sphinx-build -b dirhtml docs/ $@ - -site: $(DOCS_HTML_DST) - -coverage: $(ISSO_PY_SRC) - nosetests --with-doctest --with-coverage --cover-package=isso --cover-html isso/ - -test: $($ISSO_PY_SRC) - python setup.py nosetests - -clean: - rm -f $(DOCS_MAN_DST) $(DOCS_CSS_DST) $(ISSO_JS_DST) - rm -rf $(DOCS_HTML_DST) - -.PHONY: clean site man init js coverage test -