diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 17cfbe812..568c48d23 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -23,6 +23,7 @@
* contextvars-2.4 removed (not for Python >3.5)
* fix broken source of requests-cache-0.5.0
* update requests-cache-0.5.2
+ * fix aioftp-0.12.0, update aioftp-0.18.0
2020-09-07
* update geopy-2.0.0.ebuild
diff --git a/dev-python/aioftp/Manifest b/dev-python/aioftp/Manifest
index 4b54700b8..d02fe0208 100644
--- a/dev-python/aioftp/Manifest
+++ b/dev-python/aioftp/Manifest
@@ -1,5 +1,7 @@
DIST aioftp-0.10.1.tar.gz 44933 BLAKE2B 89627c65ded7b50441cd2bae59090e91735be1c5d80764c7d0fafeeaf978f9ee58388e6b9184a7dce5f782f23731a2b544ef8fc79070ad92654d32cff90ca421 SHA512 869176c495ee7a48933b69fed6528ace06f8f3273f588710e2bb917a8fa5e1813348401bb30206c9cdd1d5735d7c99e2e16bd41d3f64f48b37a0e37d2b96dd41
DIST aioftp-0.12.0.tar.gz 48099 BLAKE2B 1947f01781c7faee23cbcca12350e2a4b809be84382d172b29da1970b7e5bf60e2ca3aac4fa4a05ab4caeba55c98a6186baaa61abb7cc54e7683de5f2f08fecc SHA512 8e9787f8761dc72d3581fc551e4648018bd0a244fc58d179c15008bd8893194801a39f3109ce0232f47c79def16862e60e4190c197c3ef19a4d80a82643492db
+DIST aioftp-0.18.0.tar.gz 49347 BLAKE2B b717d57859ce34325f1e25941c67d352037213acc35225fea5f0d4f4ebf7020411baafdf9774bc03b3430335fc881b8b2b9fc3757db0a042ff234742388fa619 SHA512 76d77683acb8a155026761b6a22800cd08f3595bc8ba92868480dd2e04e7b9ebb4924f9179d9e306f396e32865c0f597b5b475345d2efe1603b7a8c5ca361b18
EBUILD aioftp-0.10.1.ebuild 2113 BLAKE2B 1ea2209ef14261b0a287813b744dbbb56df8ce277a009b9b16ed8172d67a699dcba68f04c1b14e38b79a8317457a1f862b668f49698aca43cf16514bf18ab047 SHA512 a6b2ac0ef9136aa681876fde5a0f8c192596e4cab39971be94023d445339b1aa913d431b1d93b9c4bcccbd538da0b176354555d8d920116919a1aab1e1b15367
-EBUILD aioftp-0.12.0.ebuild 2121 BLAKE2B a693af83369767a569e28bd3f1a3e21b5c62bcf74fe4e629dc75e6c3d13fb2caa096c35fcae5ba6b8af679441f393d8c1fc4b3b1c3efd8b398dbdce0d3e40a81 SHA512 1aed75470a9fba9553cd9cbc09a96c86a301ae0670ea5042cab1fef9dac875f6ce20301b532a4546efd21cb37ecc16770e4fa91c5d6be92e7b1a494152f502ad
-MISC metadata.xml 252 BLAKE2B 507e0ddc9d50b879ff374b903b142f85d020dfd6c486aba2af84fe082c878e780edbb79188ae10104d57db0eb775c86814cc8c06891a3854c9da840a4d377050 SHA512 9470ac9c8a5a4f80e3f767e7aa198addc7b21866c63b2a310e9f41ce65817672fb77423117bdd619e99cb62322025aeadf50717e23eafabf99080fcc106820af
+EBUILD aioftp-0.12.0.ebuild 672 BLAKE2B 1435d9b4fceae9e56b8b15b25b615512e2e7a671c7d43e5a80b4278d0294c9ee33748ab17c0c08233305f2b02a0996d686761ad14184df2d4e615387ed3c5fdb SHA512 fd4bfd55bc2005eb452f291e75982be2a2ccdd0f01ad594db072bf752815759e9ffeb657d9c33667c93d8eec305c0c71a5f1d357c78c27896bb75fbfff174986
+EBUILD aioftp-0.18.0.ebuild 672 BLAKE2B 1435d9b4fceae9e56b8b15b25b615512e2e7a671c7d43e5a80b4278d0294c9ee33748ab17c0c08233305f2b02a0996d686761ad14184df2d4e615387ed3c5fdb SHA512 fd4bfd55bc2005eb452f291e75982be2a2ccdd0f01ad594db072bf752815759e9ffeb657d9c33667c93d8eec305c0c71a5f1d357c78c27896bb75fbfff174986
+MISC metadata.xml 451 BLAKE2B 14cd4e1905ed078cb725c9d351636a27e9c001e093d6ef4dd0ec84bd320120b34ee4672e3533c3574a87923d69a8f8e42df79993e68237298539f31d8f3845b2 SHA512 1dbe33e4c62a30ddc650e74d7956670e353027dfc860fa57a8b5595a617e8885d8460383e4498318a735e11e2a6ec12ae3de6a2ceb196154b9caed29ed39f0b6
diff --git a/dev-python/aioftp/aioftp-0.12.0.ebuild b/dev-python/aioftp/aioftp-0.12.0.ebuild
index f3244dd13..e8e24c10a 100644
--- a/dev-python/aioftp/aioftp-0.12.0.ebuild
+++ b/dev-python/aioftp/aioftp-0.12.0.ebuild
@@ -1,76 +1,30 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="7"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..8} )
inherit distutils-r1
DESCRIPTION="ftp client/server for asyncio"
-HOMEPAGE="https://pypi.org/project/aioftp/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/aio-libs/aioftp https://pypi.org/project/aioftp/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
+IUSE="test"
-CDEPEND="
- >=dev-python/async_timeout-3.0.0[${PYTHON_USEDEP}]
- >=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
- dev-python/chardet[${PYTHON_USEDEP}]
- >=dev-python/multidict-4.0.0[${PYTHON_USEDEP}]
- >=dev-python/yarl-1.0[${PYTHON_USEDEP}]
- dev-python/idna-ssl[${PYTHON_USEDEP}]
-"
-DEPEND="
+RDEPEND=""
+BDEPEND="${REDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/cython[${PYTHON_USEDEP}]
- doc? (
- >=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
- dev-python/sphinxcontrib-asyncio[${PYTHON_USEDEP}]
- dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
- dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
- dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
- dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/sphinx-aiohttp-theme[${PYTHON_USEDEP}]
- )
test? (
- ${CDEPEND}
- dev-python/async_generator[${PYTHON_USEDEP}]
- >=dev-python/pytest-3.4.0[${PYTHON_USEDEP}]
- dev-python/pytest-mock[${PYTHON_USEDEP}]
- dev-python/pytest-timeout[${PYTHON_USEDEP}]
- www-servers/gunicorn[${PYTHON_USEDEP}]
- )
-"
-RDEPEND="${CDEPEND}"
-
-DOCS=( CHANGES.rst CONTRIBUTING.rst CONTRIBUTORS.txt HISTORY.rst README.rst )
-PATCHES=( "${FILESDIR}"/${PN}-3.0.5-tests.patch )
-
-python_prepare_all() {
- # skip failing tests until cause is determined
- rm tests/{test_pytest_plugin.py,test_worker.py} || die
- # AttributeError: 'brotli.Decompressor' object has no attribute 'flush'
- sed -e 's:test_compression_brotli:_\0:' \
- -e 's:test_feed_eof_no_err_brotli:_\0:' \
- -i tests/test_http_parser.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- use doc && emake -C docs html
-}
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ )"
python_test() {
- esetup.py test
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/_build/html/. )
-
- distutils-r1_python_install_all
+ nosetests --verbose || die
+ py.test -v -v || die
}
diff --git a/dev-python/aioftp/aioftp-0.18.0.ebuild b/dev-python/aioftp/aioftp-0.18.0.ebuild
new file mode 100644
index 000000000..e8e24c10a
--- /dev/null
+++ b/dev-python/aioftp/aioftp-0.18.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6..8} )
+
+inherit distutils-r1
+
+DESCRIPTION="ftp client/server for asyncio"
+HOMEPAGE="https://github.com/aio-libs/aioftp https://pypi.org/project/aioftp/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+BDEPEND="${REDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ )"
+
+python_test() {
+ nosetests --verbose || die
+ py.test -v -v || die
+}
diff --git a/dev-python/aioftp/metadata.xml b/dev-python/aioftp/metadata.xml
index 70d025d32..dd49d3be2 100644
--- a/dev-python/aioftp/metadata.xml
+++ b/dev-python/aioftp/metadata.xml
@@ -5,4 +5,11 @@
b@edevau.net
Andreas Billmeier
+
+ aioftp
+
+ multisosnooley@gmail.com
+ pohmelie
+
+