Upstream changes:
- Create config folder if it does not exist
- Changed configuration file format to allow switching between multiple logged
in accounts (#32)
- Respect XDG_CONFIG_HOME environment variable to locate config home (#12)
- Many improvements to the curses app:
- * Dynamically calculate left window width, supports narrower windows (#27)
- * Redraw windows when terminal size changes (#25)
- * Support scrolling the status list
- * Fetch next batch of statuses when bottom is reached
- * Support up/down arrows (#30)
- * Misc visual improvements
- Fix bug with app registration
- Remove hacky login_2fa command, use login_browser instead
- Add instance command
- Allow posting media without text (#24)
Tests pass, toot works as expected.
patch-Makefile got replaced with a symlink and PATH passing, add toot
itself as TDEP and use MAKE_PROGRAM.
Any takers?
diff --git a/net/toot/Makefile b/net/toot/Makefile
index 3731b470a52..4a9fb8873d2 100644
--- a/net/toot/Makefile
+++ b/net/toot/Makefile
@@ -2,7 +2,7 @@
COMMENT = interact with Mastodon social networks from the command
line
-MODPY_EGG_VERSION = 0.15.1
+MODPY_EGG_VERSION = 0.17.1
GH_ACCOUNT = ihabunek
GH_PROJECT = toot
GH_TAGNAME = ${MODPY_EGG_VERSION}
@@ -15,19 +15,24 @@ MAINTAINER = Klemens Nanni <[email protected]>
PERMIT_PACKAGE_CDROM = Yes
MODULES = lang/python
-MODPY_SETUPTOOLS = Yes
-
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
+MODPY_SETUPTOOLS = Yes
RUN_DEPENDS = devel/py-future${MODPY_FLAVOR}>=0.16 \
www/py-beautifulsoup4${MODPY_FLAVOR}>=4.5.0,<5.0 \
www/py-requests${MODPY_FLAVOR}>=2.13,<3.0
-TEST_DEPENDS = devel/py-test${MODPY_FLAVOR}>=3.0.0 \
+TEST_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH} \
+ devel/py-test${MODPY_FLAVOR}>=3.0.0 \
devel/py-test-cov${MODPY_FLAVOR}>=2.4.0
MAKE_ENV = LC_CTYPE=C.UTF-8
+TEST_ENV = PATH=${PORTPATH}
+
+pre-test:
+ ln -sf ${LOCALBASE}/bin/py.test${MODPY_BIN_SUFFIX} \
+ ${WRKDIR}/bin/py.test
do-test:
- make -C ${WRKSRC} coverage
+ ${TEST_ENV} ${MAKE_PROGRAM} -C ${WRKSRC} coverage
.include <bsd.port.mk>
diff --git a/net/toot/distinfo b/net/toot/distinfo
index 8bf53d700c2..9ca05ab9cef 100644
--- a/net/toot/distinfo
+++ b/net/toot/distinfo
@@ -1,2 +1,2 @@
-SHA256 (toot-0.15.1.tar.gz) = rM+4HxIeWddJLTC7Offm8TCou2cfQBumwjVNEUKBeV4=
-SIZE (toot-0.15.1.tar.gz) = 28010
+SHA256 (toot-0.17.1.tar.gz) = 698M4ouQ4PlD/b7GsU7M+9vjn6eR35iA5g4rgNGqrxg=
+SIZE (toot-0.17.1.tar.gz) = 34149
diff --git a/net/toot/patches/patch-Makefile b/net/toot/patches/patch-Makefile
deleted file mode 100644
index 42d075ab9fd..00000000000
--- a/net/toot/patches/patch-Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2017/12/17 21:03:54 danj Exp $
-
-Index: Makefile
---- Makefile.orig
-+++ Makefile
-@@ -19,7 +19,7 @@ publish :
- twine upload dist/*
-
- coverage:
-- py.test --cov=toot --cov-report html tests/
-+ py.test-3 --cov=toot --cov-report html tests/
-
- deb:
- @python setup.py --command-packages=stdeb.command bdist_deb
diff --git a/net/toot/pkg/PLIST b/net/toot/pkg/PLIST
index 4c0efb84d2f..4604098344f 100644
--- a/net/toot/pkg/PLIST
+++ b/net/toot/pkg/PLIST
@@ -12,16 +12,32 @@ lib/python${MODPY_VERSION}/site-packages/toot/__init__.py
lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}api.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}app.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}auth.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}commands.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}config_legacy.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}console.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}logging.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}output.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/toot/api.py
-lib/python${MODPY_VERSION}/site-packages/toot/app.py
+lib/python${MODPY_VERSION}/site-packages/toot/auth.py
lib/python${MODPY_VERSION}/site-packages/toot/commands.py
lib/python${MODPY_VERSION}/site-packages/toot/config.py
+lib/python${MODPY_VERSION}/site-packages/toot/config_legacy.py
lib/python${MODPY_VERSION}/site-packages/toot/console.py
+lib/python${MODPY_VERSION}/site-packages/toot/exceptions.py
+lib/python${MODPY_VERSION}/site-packages/toot/http.py
+lib/python${MODPY_VERSION}/site-packages/toot/logging.py
lib/python${MODPY_VERSION}/site-packages/toot/output.py
+lib/python${MODPY_VERSION}/site-packages/toot/ui/
+lib/python${MODPY_VERSION}/site-packages/toot/ui/__init__.py
+lib/python${MODPY_VERSION}/site-packages/toot/ui/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/toot/ui/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/toot/ui/${MODPY_PYCACHE}app.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/toot/ui/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/toot/ui/app.py
+lib/python${MODPY_VERSION}/site-packages/toot/ui/utils.py
lib/python${MODPY_VERSION}/site-packages/toot/utils.py
