diff options
Diffstat (limited to 'dev-util/conan')
| -rw-r--r-- | dev-util/conan/Manifest | 4 | ||||
| -rw-r--r-- | dev-util/conan/conan-1.21.1.ebuild (renamed from dev-util/conan/conan-1.18.1-r1.ebuild) | 30 |
2 files changed, 18 insertions, 16 deletions
diff --git a/dev-util/conan/Manifest b/dev-util/conan/Manifest index af974f5bbde1..57c2354cb4d4 100644 --- a/dev-util/conan/Manifest +++ b/dev-util/conan/Manifest @@ -1,5 +1,5 @@ -DIST conan-1.18.1.tar.gz 532813 BLAKE2B d4c8ec62100b8c4038f9bef8338aa0afccc38ab39d8d953c41934efc43d6ba8e5abda1438e3f8c3f4bba4b770b871a1afc5ef19749771a55873b35f28a427b1b SHA512 f9c4c4cb768c3f015a84adb3d4926cf91a372a8dae6655df9396b645c24c8694f47795064c0e93ee799864d19f6f77983da0a1679ad511d8f11702250ae95124 DIST conan-1.19.2.tar.gz 944360 BLAKE2B 190cc2a7dbe25420ae1a6b46705078301cdf1deea2b4be3d1244ade84d27250688e2c26cd5d172d4dab68557d758a2afcfebf37c323e42f0b4514455488903d8 SHA512 e9b868561465bda28314813d4114cb2b6b97440f7683c4c91911ed51b8cb06675b37807c28aaed62d5f7b470ce9040929ad61e0e148c04b0fdba7300cb633b5d -EBUILD conan-1.18.1-r1.ebuild 2149 BLAKE2B c8c8f7c1f647a0b98c438f8e2a66839206e518d38e91b9ff7cce877e1828921b8030e9294afab9adb4b7e6a978260c5b624432d28b652908353bc90f4e904667 SHA512 19ebe88837d337ccb89e87005c00f89df09524aa1da37050a4c1d600cd42d6ae2cf5412d8689034e16bc07198fdea86b71d933ea84ce814306e4b84f132988b7 +DIST conan-1.21.1.tar.gz 989780 BLAKE2B 2869ff0ee5df78d8b503a3d19e5a9ad8f5ffade5cbebf45a2b494e79c2765214d917e26494fc4585f02a613df2c7cd6eba67e74615b43443340f4d2a9406435d SHA512 7afc9ef6f073d38ffbfd51914758673daa4836d66c8785af393f601a81985a852d0f65807dbe07d3d7e826c76f4e1d78bdd4c748891ec1ed415a4ccea06f5f22 EBUILD conan-1.19.2.ebuild 2466 BLAKE2B a8e952d7cba17b9f45d6f5b27beb56ef9f2e56a78894d4e08683be7e31121b3fbcde8f942d8d23406aa77178d02783077e5c4e33f45458fb9e17a50a38f50f8e SHA512 6ad1610a5bf0d752abe69d627c30363fedf5ae4708b6fcf37dca85d4e94d1c94850b47fe8588455a83e90e6a9056a9c66c30ab8e371c861436d82e71511c1797 +EBUILD conan-1.21.1.ebuild 2390 BLAKE2B d9bf2bba639e159c2e89ad8ee6c51dfd28df0d9b5becb9de60a9026be6645df0ae26b2a724cb961691a1830ab3e230199d45ec4beacf2763d5c0c2496ba6461f SHA512 ccbff32a00f31050921a3fa50bc93aa11b6c94fca2dfbea008735aec37e226b96072872ad4740b56709cd44d995f0de245b168806810daedd33a170b6160d8f0 MISC metadata.xml 739 BLAKE2B 475521b92c84335a4ebda1d68dac1905a99f96b0fbecc8f06b6918e0c075648024ba3bebeaf85cb11ef0b96b917a2ebcf2a0146bd5b37c976d90cee08365c595 SHA512 27c7a3cea74ef2e22fd3dd238fa736efd1786fea4eaf01b9b51e07f7276101ddd7022ad7aedf767d1dbcdba2c29ddf48c07581e4fe5ec089d5e10c5b880c9970 diff --git a/dev-util/conan/conan-1.18.1-r1.ebuild b/dev-util/conan/conan-1.21.1.ebuild index 354fd9510eb7..4949de1d1b0f 100644 --- a/dev-util/conan/conan-1.18.1-r1.ebuild +++ b/dev-util/conan/conan-1.21.1.ebuild @@ -3,14 +3,14 @@ EAPI=7 -PYTHON_COMPAT=( python3_6 ) +PYTHON_COMPAT=( python3_{6,7} ) PYTHON_REQ_USE="sqlite" - +DISTUTILS_USE_SETUPTOOLS=rdepend inherit distutils-r1 DESCRIPTION="Distributed C/C++ package manager" HOMEPAGE="https://conan.io/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" +SRC_URI="https://github.com/conan-io/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" @@ -23,7 +23,6 @@ RESTRICT="!test? ( test )" # https://github.com/conan-io/conan/blob/develop/conans/requirements.txt # https://github.com/conan-io/conan/blob/develop/conans/requirements_server.txt RDEPEND=" - >=dev-python/astroid-1.6.5[${PYTHON_USEDEP}] >=dev-python/bottle-0.12.8[${PYTHON_USEDEP}] >=dev-python/colorama-0.3.3[${PYTHON_USEDEP}] >=dev-python/deprecation-2.0[${PYTHON_USEDEP}] @@ -32,23 +31,21 @@ RDEPEND=" >=dev-python/future-0.16.0[${PYTHON_USEDEP}] >=dev-python/jinja-2.10.1[${PYTHON_USEDEP}] >=dev-python/node-semver-0.6.1[${PYTHON_USEDEP}] - >=dev-python/patch-1.16[${PYTHON_USEDEP}] + >=dev-python/patch-ng-1.17.2[${PYTHON_USEDEP}] >=dev-python/pluginbase-0.5[${PYTHON_USEDEP}] >=dev-python/pygments-2.0[${PYTHON_USEDEP}] >=dev-python/pyjwt-1.4[${PYTHON_USEDEP}] - >=dev-python/pylint-2.3.1[${PYTHON_USEDEP}] >=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}] >=dev-python/pyyaml-5.1[${PYTHON_USEDEP}] >=dev-python/requests-2.8.1[${PYTHON_USEDEP}] - >=dev-python/six-1.10[${PYTHON_USEDEP}] + <dev-python/six-1.13[${PYTHON_USEDEP}] >=dev-python/tqdm-4.28.1[${PYTHON_USEDEP}] - >=dev-python/typed-ast-1.1.0[${PYTHON_USEDEP}] " -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] +BDEPEND=" test? ( - ${RDEPEND} dev-lang/go + dev-vcs/git + dev-vcs/subversion >=dev-python/mock-1.3.0[${PYTHON_USEDEP}] >=dev-python/nose-1.3.7[${PYTHON_USEDEP}] >=dev-python/parameterized-0.6.3[${PYTHON_USEDEP}] @@ -64,10 +61,15 @@ src_prepare() { -e "s:patch==1.16:patch>=1.16:g" \ -e "s:node-semver==0.6.1:node-semver>=0.6.1:g" \ -e "s:future==0.16.0:future>=0.16.0:g" \ - conans/requirements.txt + conans/requirements.txt || die } python_test() { - cd "${BUILD_DIR}"/lib || die - PYTHONPATH=. nosetests -v . || die + nosetests -v conans.test \ + -e test_ftp.* -e modify_values_test.* -e test_pkg_config_path.* \ + -e rpath_optin_test -e test_variables -e system_package_tool_installed_test \ + -e virtualbuildenv_test -e scm_test -e test_git_shallow -e tools_test \ + -e test_environment_nested -e devflow_test -e shared_chain_test \ + -e virtualenv_test \ + -A "not rest_api and not local_bottle" || die } |