Attachment 201062 Details for Bug 230379 – cleanup-sqlalchemy-deps-rev1.patch

[patch] cleanup-sqlalchemy-deps-rev1.patch

cleanup-sqlalchemy-deps-rev1.patch (text/plain), 6.22 KB, created by Kai Knoblich on 2019-01-12 14:56:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kai Knoblich

Created: 2019-01-12 14:56:25 UTC

Size: 6.22 KB

patch

obsolete

>Index: databases/py-sqlalchemy-migrate/Makefile
>===================================================================
>--- databases/py-sqlalchemy-migrate/Makefile	(revision 490056)
>+++ databases/py-sqlalchemy-migrate/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	sqlalchemy-migrate
> PORTVERSION=	0.11.0
>+PORTREVISION=	1
> CATEGORIES=	databases python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -14,7 +15,7 @@
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.3:devel/py-pbr@${PY_FLAVOR}
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.7.8:databases/py-sqlalchemy10@${PY_FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy12>=0.7.8:databases/py-sqlalchemy12@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}Tempita>=0.4:textproc/py-Tempita@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}sqlparse>0:databases/py-sqlparse@${PY_FLAVOR} \
>Index: devel/py-buildbot/Makefile
>===================================================================
>--- devel/py-buildbot/Makefile	(revision 490056)
>+++ devel/py-buildbot/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	buildbot
> PORTVERSION=	1.5.0
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	devel python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -18,7 +18,7 @@
> 		${PYTHON_PKGNAMEPREFIX}autobahn>=0.16.0:www/py-autobahn@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}zope.interface>=4.1.1:devel/py-zope.interface@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.8.0:databases/py-sqlalchemy10@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}sqlalchemy12>=0.8.0:databases/py-sqlalchemy12@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.9:databases/py-sqlalchemy-migrate@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}txaio>=2.2.2:devel/py-txaio@${PY_FLAVOR} \
>Index: devel/py-oslo.db/Makefile
>===================================================================
>--- devel/py-oslo.db/Makefile	(revision 490056)
>+++ devel/py-oslo.db/Makefile	(working copy)
>@@ -14,8 +14,6 @@
> LICENSE=	APACHE20
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-BROKEN=		conflicting dependencies
>-
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR}
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}alembic>=0.9.6:databases/py-alembic@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${PY_FLAVOR} \
>Index: misc/py-cinder/Makefile
>===================================================================
>--- misc/py-cinder/Makefile	(revision 490056)
>+++ misc/py-cinder/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	cinder
> PORTVERSION=	9.1.1
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	misc python
> MASTER_SITES=	https://fossies.org/linux/misc/openstack/
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -61,7 +61,7 @@
> 		${PYTHON_PKGNAMEPREFIX}rtslib-fb>=0:devel/py-rtslib-fb@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.0:devel/py-simplejson@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}sqlalchemy12>=0:databases/py-sqlalchemy12@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.9.6:databases/py-sqlalchemy-migrate@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}webob>=1.2.3:www/py-webob@${PY_FLAVOR} \
>Index: misc/py-glance/Makefile
>===================================================================
>--- misc/py-glance/Makefile	(revision 490056)
>+++ misc/py-glance/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	glance
> PORTVERSION=	13.0.0
>-PORTREVISION=	4
>+PORTREVISION=	5
> CATEGORIES=	misc python
> MASTER_SITES=	https://fossies.org/linux/misc/openstack/
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -16,7 +16,7 @@
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${PY_FLAVOR}
> 
> RUN_DEPENDS:=	${BUILD_DEPENDS}
>-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10@${PY_FLAVOR} \
>+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sqlalchemy12>=0:databases/py-sqlalchemy12@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:www/py-pastedeploy@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes@${PY_FLAVOR} \
>Index: misc/py-glance/pkg-plist
>===================================================================
>--- misc/py-glance/pkg-plist	(revision 490056)
>+++ misc/py-glance/pkg-plist	(working copy)
>@@ -10,6 +10,12 @@
> @sample %%ETCDIR%%/glance-manage.conf.sample
> @sample %%ETCDIR%%/glance-registry.conf.sample
> @sample %%ETCDIR%%/glance-scrubber.conf.sample
>+%%ETCDIR%%/oslo-config-generator/glance-api.conf
>+%%ETCDIR%%/oslo-config-generator/glance-cache.conf
>+%%ETCDIR%%/oslo-config-generator/glance-glare.conf
>+%%ETCDIR%%/oslo-config-generator/glance-manage.conf
>+%%ETCDIR%%/oslo-config-generator/glance-registry.conf
>+%%ETCDIR%%/oslo-config-generator/glance-scrubber.conf
> %%ETCDIR%%/policy.json
> %%ETCDIR%%/schema-image.json
> %%ETCDIR%%/glance-api-paste.ini
>Index: security/py-keystone/Makefile
>===================================================================
>--- security/py-keystone/Makefile	(revision 490056)
>+++ security/py-keystone/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	keystone
> PORTVERSION=	13.0.0
>+PORTREVISION=	1
> CATEGORIES=	security python
> MASTER_SITES=	https://tarballs.openstack.org/keystone/
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -22,7 +23,7 @@
> 		${PYTHON_PKGNAMEPREFIX}routes>=2.3.1:www/py-routes@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}cryptography>=1.9:security/py-cryptography@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0.10:databases/py-sqlalchemy10@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}sqlalchemy12>=1.0.10:databases/py-sqlalchemy12@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.11.0:databases/py-sqlalchemy-migrate@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}passlib>=1.7.0:security/py-passlib@${PY_FLAVOR} \

Actions: View | Diff

Attachments on bug 230379: 195898 | 195934 | 195935 | 195936 | 195937 | 198133 | 201061 | 201062