pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/www/py-twill
Module Name: pkgsrc
Committed By: adam
Date: Mon Nov 14 19:29:39 UTC 2022
Modified Files:
pkgsrc/www/py-twill: ALTERNATIVES Makefile PLIST distinfo
Log Message:
py-twill: updated to 3.1
3.1 (released 2022-10-30)
-------------------------
* The submit command now takes an additional parameter to specify a form
that can be used in rare cases when there are no form fields.
* Most commands do not return values any more, they are just commands.
If you are using twill from Python, you should check browser properties
like 'forms' or 'url' instead of using the return values of commands
like 'show_forms' or 'back'.
* Two-word commands now consistently have underscores in their names,
(e.g. 'form_action', 'get_input', 'show_links'). However, for convenience
and backward compatibility, you can still use the names without underscores
(e.g. 'formaction', 'getinput', 'showlinks'), and the old two-letter
abbreviations (e.g. 'fa' for 'form_action').
* Instead of 'showforms' or 'show_forms' you can now also write 'show forms',
and similarly for 'cookies', 'links', 'history' and 'html'. The command
'show html' does the same as 'show' without any arguments.
* Renamed shortcuts for user agent strings, and added some more existing ones.
* Added type hints.
* Support Python 3.11.
* Many minor fixes and improvements.
3.0.3 (released 2022-10-12)
---------------------------
* Form numbers are now printed correctly with 'showforms'.
3.0.2 (released 2022-04-10)
---------------------------
* Save HTML file with browser encoding or as UTF-8.
* Do not modify root logger any more.
3.0.1 (released 2021-12-04)
---------------------------
* This version now also supports Python 3.10.
* The twill language now allows 8-bit letters to appear in strings unquoted.
3.0 (released 2021-02-25)
-------------------------
* In this version we require Python 3.6 to 3.9.
If you still need support for Python 2 or Python 3.5,
then please use the latest version from the 2.x branch.
* The code has been optimized for Python 3 now.
* Some minor fixes.
2.0.3 (released 2021-02-25)
---------------------------
* Backported the fixes in version 3.0.
2.0.2 (released 2021-02-13)
---------------------------
* This version now also supports Python 3.9.
* 'tidy_should_exist' has been renamed ot 'require_tidy'.
* Support for setting options to be used with HTML Tidy.
* Cleanup scripts are now also read as UTF-8 in Python 3.
2.0.1 (released 2020-07-12)
---------------------------
* Fixes an issue with encoding declarations.
2.0 (released 2020-04-04)
-------------------------
This version is based on twill 1.8, which was a refactoring
of version 0.9 that used requests_ and lxml_ instead of mechanize_,
done by Ben Taylor in April 2014. It also integrates ideas and
code from Flunc_ which was created by Luke Tucker and Robert Marianski
in 2006-2007, and from ReTwill_ which was created in April 2012
as a fork from twill 0.9 by Adam Victor Brandizzi.
The following improvements and changes were made in this version:
* Larger refactoring, clean-up and modernization efforts to support
Python 2.7, 3.5 and higher.
* The console script has been renamed from 'twill-sh' to just 'twill'.
* We assume the default file extension '.twill' for twill scripts now.
* Uses lxml_ and requests_ instead of mechanize_ (like in version 1.8),
but doesn't need cssselect_ and `Beautiful Soup`_ any more (unlike 1.8).
* Removed bundled packages which have become unnecessary (mechanize)
or are available in newer versions on PyPI (pyparsing, wsgi_intercept)
or in the standard library (subprocess).
* Removed parsing options (use_tidy, use_BeautifulSoup, allow_parse_errors)
which have become insignificant due to the use of lxml.html.
* We use pytest_ instead of nose_ for testing twill now.
* A tox_ configuration file for running tests with different Python versions
has been added.
* Optimized the order of the URLs that are tried out by the twill browser.
* Added an option '-d' to dump the last HTML to a file or standard output
and an option '-w' to show the HTML directly in the web browser (this
feature was taken over from Flunc).
* Added alias 'rf' for 'runfiles' and made runfiles run directories of
scripts as well. This helps writing test suites for twill scripts.
* Added command 'add_cleanup' to unconditionally run cleanup scripts after
the current script finished. This allows resetting the state of the
tested server, so that tests will always re-run on a clean state.
Together with a small init.twill script, this creates a test fixture.
(This idea was taken from Flunc, which supports cleanup scripts for
test suites, although in a somewhat different way.)
* Non string values are now accepted in variable substitution (this feature
has been backported from ReTwill).
* XPath expressions are now supported in find/notfind commands (this feature
has been backported from ReTwill).
* Made output better controllable by using log levels (this feature has
been backported from ReTwill). See options '-l' and '-o'.
* Updated the map of predefined user agent strings.
* Basic authentication with realm is now supported again
(the 'with_default_realm' option, which was broken in version 1.8,
has been switched off).
* Server certificates are not verified by default any more, since they are
usually not valid on test and staging servers.
* Improved handling of meta refresh. Circular redirects are detected and
'debug equiv-refresh' is functional again. A limit for the refresh time
interval can be set with the 'equiv_refresh_interval' option. By default
this is set to 2, so refresh intervals of 2 or more seconds are ignored.
* Moved the examples and additional stuff into an 'extras' directory.
* The documentation in the 'docs' directory has been updated and is now
created with Sphinx_.
* Made sure everything (except twill-forks) also works on Windows.
* Fixed a lot of smaller and larger bugs and problems.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/py-twill/ALTERNATIVES \
pkgsrc/www/py-twill/PLIST
cvs rdiff -u -r1.18 -r1.19 pkgsrc/www/py-twill/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/py-twill/distinfo
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/www/py-twill/ALTERNATIVES
diff -u pkgsrc/www/py-twill/ALTERNATIVES:1.1 pkgsrc/www/py-twill/ALTERNATIVES:1.2
--- pkgsrc/www/py-twill/ALTERNATIVES:1.1 Sat May 3 19:09:48 2014
+++ pkgsrc/www/py-twill/ALTERNATIVES Mon Nov 14 19:29:38 2022
@@ -1,2 +1,2 @@
-bin/twill-fork @PREFIX@/bin/twill-fork@PYVERSSUFFIX@
-bin/twill-sh @PREFIX@/bin/twill-sh@PYVERSSUFFIX@
+bin/twill @PREFIX@/bin/twill-@PYVERSSUFFIX@
+bin/twill-fork @PREFIX@/bin/twill-fork-@PYVERSSUFFIX@
Index: pkgsrc/www/py-twill/PLIST
diff -u pkgsrc/www/py-twill/PLIST:1.1 pkgsrc/www/py-twill/PLIST:1.2
--- pkgsrc/www/py-twill/PLIST:1.1 Sat May 3 01:56:29 2014
+++ pkgsrc/www/py-twill/PLIST Mon Nov 14 19:29:38 2022
@@ -1,14 +1,21 @@
-@comment $NetBSD: PLIST,v 1.1 2014/05/03 01:56:29 rodent Exp $
-bin/twill-fork${PYVERSSUFFIX}
-bin/twill-sh${PYVERSSUFFIX}
+@comment $NetBSD: PLIST,v 1.2 2022/11/14 19:29:38 adam Exp $
+bin/twill-${PYVERSSUFFIX}
+bin/twill-fork-${PYVERSSUFFIX}
${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
${PYSITELIB}/${EGG_INFODIR}/top_level.txt
${PYSITELIB}/twill/__init__.py
${PYSITELIB}/twill/__init__.pyc
${PYSITELIB}/twill/__init__.pyo
+${PYSITELIB}/twill/__main__.py
+${PYSITELIB}/twill/__main__.pyc
+${PYSITELIB}/twill/__main__.pyo
+${PYSITELIB}/twill/agents.py
+${PYSITELIB}/twill/agents.pyc
+${PYSITELIB}/twill/agents.pyo
${PYSITELIB}/twill/browser.py
${PYSITELIB}/twill/browser.pyc
${PYSITELIB}/twill/browser.pyo
@@ -42,102 +49,21 @@ ${PYSITELIB}/twill/extensions/formfill.p
${PYSITELIB}/twill/extensions/mailman_sf.py
${PYSITELIB}/twill/extensions/mailman_sf.pyc
${PYSITELIB}/twill/extensions/mailman_sf.pyo
-${PYSITELIB}/twill/extensions/match_parse/__init__.py
-${PYSITELIB}/twill/extensions/match_parse/__init__.pyc
-${PYSITELIB}/twill/extensions/match_parse/__init__.pyo
-${PYSITELIB}/twill/extensions/match_parse/test-match_parse.py
-${PYSITELIB}/twill/extensions/match_parse/test-match_parse.pyc
-${PYSITELIB}/twill/extensions/match_parse/test-match_parse.pyo
+${PYSITELIB}/twill/extensions/match_parse.py
+${PYSITELIB}/twill/extensions/match_parse.pyc
+${PYSITELIB}/twill/extensions/match_parse.pyo
${PYSITELIB}/twill/extensions/require.py
${PYSITELIB}/twill/extensions/require.pyc
${PYSITELIB}/twill/extensions/require.pyo
-${PYSITELIB}/twill/extensions/test_extensions.py
-${PYSITELIB}/twill/extensions/test_extensions.pyc
-${PYSITELIB}/twill/extensions/test_extensions.pyo
+${PYSITELIB}/twill/extensions/shell_test_extension.py
+${PYSITELIB}/twill/extensions/shell_test_extension.pyc
+${PYSITELIB}/twill/extensions/shell_test_extension.pyo
+${PYSITELIB}/twill/fork.py
+${PYSITELIB}/twill/fork.pyc
+${PYSITELIB}/twill/fork.pyo
${PYSITELIB}/twill/namespaces.py
${PYSITELIB}/twill/namespaces.pyc
${PYSITELIB}/twill/namespaces.pyo
-${PYSITELIB}/twill/other_packages/__init__.py
-${PYSITELIB}/twill/other_packages/__init__.pyc
-${PYSITELIB}/twill/other_packages/__init__.pyo
-${PYSITELIB}/twill/other_packages/_mechanize_dist/ClientForm.py
-${PYSITELIB}/twill/other_packages/_mechanize_dist/ClientForm.pyc
-${PYSITELIB}/twill/other_packages/_mechanize_dist/ClientForm.pyo
-${PYSITELIB}/twill/other_packages/_mechanize_dist/__init__.py
-${PYSITELIB}/twill/other_packages/_mechanize_dist/__init__.pyc
-${PYSITELIB}/twill/other_packages/_mechanize_dist/__init__.pyo
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_auth.py
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_auth.pyc
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_auth.pyo
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_beautifulsoup.py
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_beautifulsoup.pyc
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_beautifulsoup.pyo
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_clientcookie.py
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_clientcookie.pyc
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_clientcookie.pyo
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_debug.py
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_debug.pyc
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_debug.pyo
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_gzip.py
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_gzip.pyc
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_gzip.pyo
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_headersutil.py
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_headersutil.pyc
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_headersutil.pyo
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_html.py
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_html.pyc
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_html.pyo
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_http.py
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_http.pyc
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_http.pyo
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_lwpcookiejar.py
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_lwpcookiejar.pyc
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_lwpcookiejar.pyo
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_mechanize.py
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_mechanize.pyc
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_mechanize.pyo
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_mozillacookiejar.py
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_mozillacookiejar.pyc
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_mozillacookiejar.pyo
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_msiecookiejar.py
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_msiecookiejar.pyc
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_msiecookiejar.pyo
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_opener.py
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_opener.pyc
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_opener.pyo
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_pullparser.py
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_pullparser.pyc
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_pullparser.pyo
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_request.py
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_request.pyc
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_request.pyo
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_response.py
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_response.pyc
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_response.pyo
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_rfc3986.py
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_rfc3986.pyc
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_rfc3986.pyo
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_seek.py
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_seek.pyc
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_seek.pyo
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_upgrade.py
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_upgrade.pyc
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_upgrade.pyo
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_urllib2.py
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_urllib2.pyc
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_urllib2.pyo
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_useragent.py
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_useragent.pyc
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_useragent.pyo
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_util.py
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_util.pyc
-${PYSITELIB}/twill/other_packages/_mechanize_dist/_util.pyo
-${PYSITELIB}/twill/other_packages/pyparsing.py
-${PYSITELIB}/twill/other_packages/pyparsing.pyc
-${PYSITELIB}/twill/other_packages/pyparsing.pyo
-${PYSITELIB}/twill/other_packages/subprocess.py
-${PYSITELIB}/twill/other_packages/subprocess.pyc
-${PYSITELIB}/twill/other_packages/subprocess.pyo
${PYSITELIB}/twill/parse.py
${PYSITELIB}/twill/parse.pyc
${PYSITELIB}/twill/parse.pyo
@@ -150,6 +76,3 @@ ${PYSITELIB}/twill/unit.pyo
${PYSITELIB}/twill/utils.py
${PYSITELIB}/twill/utils.pyc
${PYSITELIB}/twill/utils.pyo
-${PYSITELIB}/twill/wsgi_intercept.py
-${PYSITELIB}/twill/wsgi_intercept.pyc
-${PYSITELIB}/twill/wsgi_intercept.pyo
Index: pkgsrc/www/py-twill/Makefile
diff -u pkgsrc/www/py-twill/Makefile:1.18 pkgsrc/www/py-twill/Makefile:1.19
--- pkgsrc/www/py-twill/Makefile:1.18 Wed Jan 5 20:07:11 2022
+++ pkgsrc/www/py-twill/Makefile Mon Nov 14 19:29:38 2022
@@ -1,29 +1,30 @@
-# $NetBSD: Makefile,v 1.18 2022/01/05 20:07:11 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2022/11/14 19:29:38 adam Exp $
-DISTNAME= twill-1.8.0
+DISTNAME= twill-3.1
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION= 3
-CATEGORIES= python www
+CATEGORIES= www python
MASTER_SITES= ${MASTER_SITE_PYPI:=t/twill/}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://twill.idyll.org/
-COMMENT= Python package for the twill Web browsing language
+HOMEPAGE= https://github.com/twill-tools/twill
+COMMENT= Simple scripting language for web browsing
LICENSE= mit
-DEPENDS+= ${PYPKGPREFIX}-cssselect-[0-9]*:../../textproc/py-cssselect
+DEPENDS+= ${PYPKGPREFIX}-lxml>=4.9:../../textproc/py-lxml
+DEPENDS+= ${PYPKGPREFIX}-pyparsing>=3.0:../../devel/py-pyparsing
+DEPENDS+= ${PYPKGPREFIX}-requests>=2.27:../../devel/py-requests
USE_LANGUAGES= # none
-PYTHON_VERSIONS_ACCEPTED= 27 # setup fails for 1.8.0
-
USE_PKG_RESOURCES= yes
+PYTHON_VERSIONS_INCOMPATIBLE= 27
+
post-install:
- ${MV} ${DESTDIR}${PREFIX}/bin/twill-fork \
- ${DESTDIR}${PREFIX}/bin/twill-fork${PYVERSSUFFIX} || ${TRUE}
- ${MV} ${DESTDIR}${PREFIX}/bin/twill-sh \
- ${DESTDIR}${PREFIX}/bin/twill-sh${PYVERSSUFFIX} || ${TRUE}
+.for bin in twill twill-fork
+ cd ${DESTDIR}${PREFIX}/bin && \
+ ${MV} ${bin} ${bin}-${PYVERSSUFFIX} || ${TRUE}
+.endfor
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/www/py-twill/distinfo
diff -u pkgsrc/www/py-twill/distinfo:1.4 pkgsrc/www/py-twill/distinfo:1.5
--- pkgsrc/www/py-twill/distinfo:1.4 Tue Oct 26 11:30:49 2021
+++ pkgsrc/www/py-twill/distinfo Mon Nov 14 19:29:38 2022
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 11:30:49 nia Exp $
+$NetBSD: distinfo,v 1.5 2022/11/14 19:29:38 adam Exp $
-BLAKE2s (twill-1.8.0.tar.gz) = 4cdb9ee96e5a8e730889bdaa8861d87fac0386ede60113c4cd6869f8fdb93ac1
-SHA512 (twill-1.8.0.tar.gz) = c0b2a46f827d478939aa964712dcce4ab1a2f41a5ad21ecd6f122d219a2cb91315d04fb1b6e7b033d70f875824698a07e5a896431173057a6cd212b9a8c688cb
-Size (twill-1.8.0.tar.gz) = 176989 bytes
+BLAKE2s (twill-3.1.tar.gz) = 3b8090e17970ea5ebc659ba2916ddf03aee873b7a440f759f5f38cbee6b0b464
+SHA512 (twill-3.1.tar.gz) = e0f25d011bd70b8f26075febb6729198a07dda69b66bf460d1983e130f8598375f4d7e870afe4400ed2cb9d9341a148c2f03cefe538f654b58cd40d92b3e08fe
+Size (twill-3.1.tar.gz) = 82442 bytes
Home |
Main Index |
Thread Index |
Old Index