commit 63d7b9a319791d5e36891e56121ee04102a35d5b
parent 273a10b16982f39df8db0ad23b8d3d34f2ddd28e
Author: Daven Savoie <daps218@gmail.com>
Date: Wed, 15 Sep 2021 04:49:19 +0000
Merge branch 'daven/0.0.0' into 'master'
Daven/0.0.0
See merge request chaintool/chainqueue!3
Diffstat:
4 files changed, 47 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -0,0 +1,42 @@
+stages:
+- build
+- test
+#running the bash script in test
+
+build_and_push:
+ image: registry.gitlab.com/grassrootseconomics/cic-base-images:python-3.8.6-dev
+ stage: build
+ variables:
+ #CI_DEBUG_TRACE: "true"
+ CIC_PACKAGE_REGISTRY_PROJECT_ID: 27624814
+ script:
+ #- python -m pip install --upgrade setuptools wheel pip twine semver
+ - python -m pip install --extra-index-url https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple --extra-index-url https://pip.grassrootseconomics.net:8433 install -r requirements.txt
+ - python setup.py sdist bdist_wheel
+ - TWINE_PASSWORD=${CI_JOB_TOKEN} TWINE_USERNAME=gitlab-ci-token python -m twine upload --skip-existing --repository-url ${CI_API_V4_URL}/projects/${CIC_PACKAGE_REGISTRY_PROJECT_ID}/packages/pypi dist/*
+ # Below are the built dependencies
+ #- TWINE_PASSWORD=${CI_JOB_TOKEN} TWINE_USERNAME=gitlab-ci-token python -m twine upload --repository-url ${CI_API_V4_URL}/projects/${CIC_PACKAGE_REGISTRY_PROJECT_ID}/packages/pypi /tmp/wheelhouse/*
+ only:
+ - master
+ - daven/*
+
+tests:
+ image: registry.gitlab.com/grassrootseconomics/cic-base-images:python-3.8.6-dev
+ stage: test
+ variables:
+ #CI_DEBUG_TRACE: "true"
+ CIC_PACKAGE_REGISTRY_PROJECT_ID: 27624814
+ script:
+ - ls
+ - python -m pip install --extra-index-url https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple --extra-index-url https://pip.grassrootseconomics.net:8433 install -r requirements.txt -r test_requirements.txt
+ - python -m pip freeze
+ - ls
+ - export PYTHONPATH=.
+ - PYTHONPATH=. bash run_tests.sh
+
+ only:
+ - master
+ - daven/0.0.0
+
+# rules:
+# - if: $CI_PIPELINE_SOURCE == "merge_request_event"
diff --git a/requirements.txt b/requirements.txt
@@ -5,4 +5,4 @@ alembic==1.4.2
SQLAlchemy==1.3.20
confini>=0.4.1a1,<0.5.0
pyxdg~=0.27
-chainlib~=0.0.9a7
+chainlib~=0.0.9a10
diff --git a/run_tests.sh b/run_tests.sh
@@ -2,7 +2,9 @@
set +e
set +x
-export PYTHONPATH={$PYTHONPATH:-.}
+default_pythonpath=$PYTHONPATH:.
+export PYTHONPATH=${default_pythonpath:-.}
+>&2 echo using pythonpath $PYTHONPATH
for f in `ls tests/*.py`; do
python $f
if [ $? -gt 0 ]; then
diff --git a/test_requirements.txt b/test_requirements.txt
@@ -1 +1 @@
-chainlib==0.0.3rc2
+chainlib==0.0.9a10