From 2ef822ad6d9e4602784a8f054496825ceaebb1e2 Mon Sep 17 00:00:00 2001 From: Patrick Delcroix Date: Mon, 2 May 2022 09:06:54 +0200 Subject: [PATCH 1/3] 1.4 --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 46d9658..f5f7773 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ setup( name='openimis-be-calcrule-contribution-legacy', - version='1.0.0', + version='1.4.0', packages=find_packages(), include_package_data=True, license='GNU AGPL v3', @@ -40,4 +40,4 @@ 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', ], -) \ No newline at end of file +) From f5feb8368ff1e7e1d456a587956ba9d102770190 Mon Sep 17 00:00:00 2001 From: Dragos DOBRE Date: Mon, 13 Jun 2022 10:03:48 +0200 Subject: [PATCH 2/3] Update python-publish.yml --- .github/workflows/python-publish.yml | 125 +++++++-------------------- 1 file changed, 32 insertions(+), 93 deletions(-) diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index 49f5ca4..4b00014 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -1,99 +1,38 @@ -name: Automated CI testing -# This workflow run automatically for every commit on github it checks the syntax and launch the tests. -# | grep . | uniq -c filters out empty lines and then groups consecutive lines together with the number of occurrences +# This workflows will upload a Python Package using Twine when a release is created +# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries + +name: Upload Python Package + on: - pull_request: - workflow_dispatch: - inputs: - comment: - description: Just a simple comment to know the purpose of the manual build - required: false + release: + types: [created] jobs: - run_test: + deploy: + runs-on: ubuntu-latest - services: - mssql: - image: mcr.microsoft.com/mssql/server:2017-latest - env: - ACCEPT_EULA: Y - SA_PASSWORD: GitHub999 - ports: - - 1433:1433 - # needed because the mssql container does not provide a health check - options: --health-interval=10s --health-timeout=3s --health-start-period=10s --health-retries=10 --health-cmd="/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P ${SA_PASSWORD} -Q 'SELECT 1' || exit 1" steps: - - name: Set up Python 3.8 - uses: actions/setup-python@v2 - with: - python-version: 3.8 - - name: install linux packages - run: | - git clone --depth 1 --branch develop https://github.com/openimis/database_ms_sqlserver.git ./sql - cd sql/ && bash concatenate_files.sh && cd .. - curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add - - curl https://packages.microsoft.com/config/ubuntu/20.04/prod.list | sudo tee /etc/apt/sources.list.d/msprod.list - sudo apt-get update - sudo ACCEPT_EULA=Y apt-get install -y mssql-tools build-essential dialog apt-utils unixodbc-dev -y - python -m pip install --upgrade pip - - name: pull openimis backend - run: | - rm ./openimis -rf - git clone --depth 1 --branch develop https://github.com/openimis/openimis-be_py.git ./openimis - - name: copy current branch - uses: actions/checkout@v2 - with: - path: './current-module' - - name: Update the configuration - working-directory: ./openimis - run: | - export MODULE_NAME="$(echo $GITHUB_REPOSITORY | sed 's#^openimis/openimis-be-\(.*\)_py$#\1#')" - echo "the local module called $MODULE_NAME will be injected in openIMIS .json" - jq --arg name "$MODULE_NAME" 'if [.modules[].name == ($name)]| max then (.modules[] | select(.name == ($name)) | .pip)|="../current-module" else .modules |= .+ [{name:($name), pip:"../current-module"}] end' openimis.json - echo $(jq --arg name "$MODULE_NAME" 'if [.modules[].name == ($name)]| max then (.modules[] | select(.name == ($name)) | .pip)|="../current-module" else .modules |= .+ [{name:($name), pip:"../current-module"}] end' openimis.json) > openimis.json - - name: Install openIMIS Python dependencies - working-directory: ./openimis - run: | - pip install -r requirements.txt - python modules-requirements.py openimis.json > modules-requirements.txt - cat modules-requirements.txt - pip install -r modules-requirements.txt - - name: Environment info - working-directory: ./openimis - run: | - pip list - - name: Initialize DB - run: | - /opt/mssql-tools/bin/sqlcmd -S localhost,1433 -U SA -P $SA_PASSWORD -Q 'DROP DATABASE IF EXISTS imis' - /opt/mssql-tools/bin/sqlcmd -S localhost,1433 -U SA -P $SA_PASSWORD -Q 'CREATE DATABASE imis' - /opt/mssql-tools/bin/sqlcmd -S localhost,1433 -U SA -P $SA_PASSWORD -d imis -i sql/output/fullDemoDatabase.sql | grep . | uniq -c - env: - SA_PASSWORD: GitHub999 - ACCEPT_EULA: Y - -# - name: Check formatting with black -# run: | -# black --check . - - - name: Django tests - working-directory: ./openimis/openIMIS - run: | - export MODULE_NAME="$(echo $GITHUB_REPOSITORY | sed 's#^openimis/openimis-be-\(.*\)_py$#\1#')" - python -V - ls -l - python manage.py migrate - python init_test_db.py | grep . | uniq -c - python manage.py test --keepdb $MODULE_NAME - env: - SECRET_KEY: secret - DEBUG: true - #DJANGO_SETTINGS_MODULE: hat.settings - DB_HOST: localhost - DB_PORT: 1433 - DB_NAME: imis - DB_USER: sa - DB_PASSWORD: GitHub999 - #DEV_SERVER: true - SITE_ROOT: api - REMOTE_USER_AUTHENTICATION: True + - uses: olegtarasov/get-tag@v2.1 + id: tagName + - uses: actions/checkout@v2 + - name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: '3.x' + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install setuptools wheel twine jq + + - name: update setup.py + run: | + echo "tag to use $GIT_TAG_NAME" + sed -i "s/version='.*'/version='$GIT_TAG_NAME'/g" setup.py + - name: Build and publish + env: + TWINE_USERNAME: __token__ + TWINE_PASSWORD: ${{secrets.PYPI_TOKEN}} + run: | + python setup.py sdist bdist_wheel + twine upload dist/* From 9a05427cc02bd00334cb388617100b62503acdfc Mon Sep 17 00:00:00 2001 From: Damian Borowiecki Date: Tue, 19 Sep 2023 11:16:01 +0200 Subject: [PATCH 3/3] Sonar Added --- .github/workflows/ci.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..2782aa1 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,30 @@ +name: Module CI +on: + pull_request: + types: [opened, synchronize, reopened] + push: + branches: + - main + - 'release/**' + - develop + - 'feature/**' + workflow_dispatch: + inputs: + comment: + description: Just a simple comment to know the purpose of the manual build + required: false + +jobs: + call: + name: Default CI Flow + uses: openimis/openimis-be_py/.github/workflows/ci_module.yml@develop + secrets: + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + with: + SONAR_PROJECT_KEY: openimis_openimis-be-calcrule_contribution_legacy_py + SONAR_ORGANIZATION: openimis-1 + SONAR_PROJECT_NAME: openimis-be-calcrule_contribution_legacy_py + SONAR_PROJECT_VERSION: 1.0 + SONAR_SOURCES: calcrule_contribution_legacy + SONAR_EXCLUSIONS: "**/migrations/**,**/static/**,**/media/**,**/tests/**" +