--- a/components/python/alembic/Makefile Tue Apr 07 15:49:29 2015 -0700
+++ b/components/python/alembic/Makefile Tue Apr 07 13:31:20 2015 -0700
@@ -22,22 +22,20 @@
#
# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
+
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= alembic
-COMPONENT_VERSION= 0.6.0
+COMPONENT_VERSION= 0.7.4
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:ad28e2e4f8bb712d1e67abc709b0735525541e0ebc509dbf00bcd383b5c602ca
+ sha256:550f10b2266f689778eced2fed899bfd05755737478454b97fb99385f2e780e5
COMPONENT_ARCHIVE_URL= $(call pypi_url)
COMPONENT_PROJECT_URL= https://pypi.python.org/pypi/alembic/
COMPONENT_BUGDB= python-mod/alembic
-TPNO= 14503
-
-# Depends on sqlalchemy which is not Python 3 ready.
-PYTHON_VERSIONS= 2.7 2.6
+TPNO= 21714
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/setup.py.mk
@@ -45,19 +43,19 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
-COMPONENT_TEST_DIR= $(COMPONENT_SRC)
-COMPONENT_TEST_ARGS= setup.py test
+COMPONENT_POST_INSTALL_ACTION += \
+ (cd $(PROTO_DIR)/usr/bin ; $(MV) -f alembic alembic-$(PYTHON_VERSION))
+
+COMPONENT_PRE_TEST_ACTION= echo "[db]" > $(SOURCE_DIR)/test.cfg
+COMPONENT_TEST_DIR= $(SOURCE_DIR)
+COMPONENT_TEST_ARGS= setup.py test
# common targets
build: $(BUILD_NO_ARCH)
install: $(INSTALL_NO_ARCH)
-# Tests should work, but the test suite will attempt to run a subset of
-# tests against various database backends, including Postgresql and MySQL,
-# so will take a bit of hooking up. Just marking as "no tests" for now,
-# to allow the OpenStack Neutron developers to get on with their work.
-test: $(NO_TESTS)
+test: $(TEST_NO_ARCH)
REQUIRED_PACKAGES += library/python/setuptools-26