diff --git a/common_requirements.in b/common_requirements.in index 772c1115d857664ed113007b89a6f7f9d9c48b99..c255e6d9f2f94ea97b5cd0f55c9ab2c2a1c22931 100644 --- a/common_requirements.in +++ b/common_requirements.in @@ -2,8 +2,10 @@ coverage==6.3 grpcio==1.47.* grpcio-health-checking==1.47.* grpcio-tools==1.47.* +prettytable==3.5.0 prometheus-client==0.13.0 protobuf==3.20.* pytest==6.2.5 pytest-benchmark==3.4.1 python-dateutil==2.8.2 +pytest-depends==1.0.1 diff --git a/src/context/.gitlab-ci.yml b/src/context/.gitlab-ci.yml index ef780f7e3da5440f17f6a83cfcc7ba22201acf7c..9004d7dcd10fda7f5a7c8ea59f5a66b5a5d8cf0a 100644 --- a/src/context/.gitlab-ci.yml +++ b/src/context/.gitlab-ci.yml @@ -51,7 +51,7 @@ unit test context: - if docker network list | grep teraflowbridge; then echo "teraflowbridge is already created"; else docker network create -d bridge teraflowbridge; fi - if docker container ls | grep crdb; then docker rm -f crdb; else echo "CockroachDB container is not in the system"; fi - if docker volume ls | grep crdb; then docker volume rm -f crdb; else echo "CockroachDB volume is not in the system"; fi - - if docker container ls | grep $IMAGE_NAME; then docker rm -f $IMAGE_NAME; else echo "$IMAGE_NAME image is not in the system"; fi + - if docker container ls | grep $IMAGE_NAME; then docker rm -f $IMAGE_NAME; else echo "$IMAGE_NAME container is not in the system"; fi script: - docker pull "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG" - docker pull "cockroachdb/cockroach:latest-v22.2" @@ -62,7 +62,6 @@ unit test context: --env COCKROACH_USER=tfs --env COCKROACH_PASSWORD=tfs123 --volume "crdb:/cockroach/cockroach-data" - --volume "~/init-scripts:/docker-entrypoint-initdb.d" cockroachdb/cockroach:latest-v22.2 start-single-node - sleep 10 - CRDB_ADDRESS=$(docker inspect crdb --format "{{.NetworkSettings.Networks.teraflowbridge.IPAddress}}") diff --git a/src/context/requirements.in b/src/context/requirements.in index f5d5ccbe2cf5d8f85649f85f00f6c9fa9b21cfc4..83ae02faf4e366afee12106839db641f19554f49 100644 --- a/src/context/requirements.in +++ b/src/context/requirements.in @@ -1,10 +1,4 @@ -Flask==2.1.3 -Flask-RESTful==0.3.9 psycopg2-binary==2.9.3 -pytest-depends==1.0.1 -redis==4.1.2 -requests==2.27.1 SQLAlchemy==1.4.40 sqlalchemy-cockroachdb==1.4.3 SQLAlchemy-Utils==0.38.3 -prettytable==3.5.0