diff --git a/.gitattributes b/.gitattributes index 15d62d6..2c85720 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1 @@ poetry.lock linguist-generated=true -setup.py linguist-generated=true diff --git a/.github/actions/prepare_poetry_env/action.yml b/.github/actions/prepare_poetry_env/action.yml index 076b029..0c49983 100644 --- a/.github/actions/prepare_poetry_env/action.yml +++ b/.github/actions/prepare_poetry_env/action.yml @@ -13,7 +13,7 @@ runs: python-version: ${{ inputs.python-version }} - uses: abatilo/actions-poetry@v2 with: - poetry-version: 1.2.0 + poetry-version: 1.4.0 - name: Poetry install run: poetry install shell: bash diff --git a/.github/workflows/check_ci.yaml b/.github/workflows/check_ci.yaml index d43e29d..bbaf81f 100644 --- a/.github/workflows/check_ci.yaml +++ b/.github/workflows/check_ci.yaml @@ -3,20 +3,13 @@ name: Run Unit Tests on: [push] jobs: - check_setup_py: + run_unit_tests: environment: AWS runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: actions/setup-python@v2 - with: - python-version: 3.8 - - uses: abatilo/actions-poetry@v2 - with: - poetry-version: 1.2.0 - - name: Setup poetry env - run: bash scripts/build/setup_poetry_env.sh "python3.8" + - uses: ./.github/actions/prepare_poetry_env - name: Run pytest run: poetry run pytest diff --git a/.github/workflows/check_setup_py.yaml b/.github/workflows/check_setup_py.yaml deleted file mode 100644 index ad67770..0000000 --- a/.github/workflows/check_setup_py.yaml +++ /dev/null @@ -1,20 +0,0 @@ -name: Check packaging is up to date - -on: [push] - -jobs: - check_setup_py: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v2 - with: - python-version: 3.8 - - uses: abatilo/actions-poetry@v2 - with: - poetry-version: 1.2.0 - - name: Run packaging update - run: bash githooks/update_packaging.sh "python3.8" - - name: Check git status - run: bash scripts/build/check_git_status.sh diff --git a/.github/workflows/check_version.yaml b/.github/workflows/check_version.yaml index fd6aa8c..bd47494 100644 --- a/.github/workflows/check_version.yaml +++ b/.github/workflows/check_version.yaml @@ -12,13 +12,6 @@ jobs: - uses: actions/checkout@v3 with: fetch-depth: 0 - - name: Setup Python 3.8 - uses: actions/setup-python@v2 - with: - python-version: 3.8 - - name: Install Poetry - uses: abatilo/actions-poetry@v2 - with: - poetry-version: 1.2.0 + - uses: ./.github/actions/prepare_poetry_env - name: Check Release run: ./scripts/build/check_release.sh "python3.8" diff --git a/doc/changes/changelog.md b/doc/changes/changelog.md index 9e44c67..83ce934 100644 --- a/doc/changes/changelog.md +++ b/doc/changes/changelog.md @@ -1,5 +1,6 @@ # Changes +* [1.1.0](changes_1.1.0.md) * [1.0.0](changes_1.0.0.md) * [0.8.0](changes_0.8.0.md) * [0.7.0](changes_0.7.0.md) diff --git a/doc/changes/changes_1.0.0.md b/doc/changes/changes_1.0.0.md index ea1b0ed..5d4183c 100644 --- a/doc/changes/changes_1.0.0.md +++ b/doc/changes/changes_1.0.0.md @@ -1,4 +1,4 @@ -# script-languages-container-ci-setup 0.8.0, released 2023-03-22 +# script-languages-container-ci-setup 1.0.0, released 2023-03-22 Code name: Release on PyPi diff --git a/doc/changes/changes_1.1.0.md b/doc/changes/changes_1.1.0.md new file mode 100644 index 0000000..8ca0b1f --- /dev/null +++ b/doc/changes/changes_1.1.0.md @@ -0,0 +1,23 @@ +# script-languages-container-ci-setup 1.1.0, released TBD + +Code name: TBD + +## Summary + +TBD + +## Bug Fixes + +n/a + +## Features / Enhancements + +n/a + +## Documentation + +n/a + +## Refactoring + + - #43: Removed setup.py and updated to poetry 1.4.0 diff --git a/githooks/update_packaging.sh b/githooks/update_packaging.sh deleted file mode 100755 index b84d29f..0000000 --- a/githooks/update_packaging.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash -set -o errexit -set -o nounset -set -o pipefail - -# define colors for use in output -no_color='\033[0m' -grey='\033[0;90m' - -# Jump to the current project's root directory (the one containing -# .git/) -ROOT_DIR=$(git rev-parse --show-toplevel || echo) -NO_GIT=FALSE -if [ -z "$ROOT_DIR" ] -then - echo "Did not found git repository, using '$PWD' as ROOT_DIR" - NO_GIT=TRUE - ROOT_DIR=$PWD -fi - -#pushd "$ROOT_DIR" > /dev/null -pushd "$ROOT_DIR" - -echo -e "Generate setup.py ${grey}(pre-commit hook)${no_color}" -if [ -d "dist" ] -then - rm -r "dist" -fi -poetry build > /dev/null -pushd dist > /dev/null -tar_file=$(ls -- *.tar.gz) -extracted_dir=${tar_file%.tar.gz} -tar -xf "$tar_file" -cp "$extracted_dir/setup.py" ../setup.py -rm -r "$extracted_dir" -popd > /dev/null - -if [ "$NO_GIT" == "FALSE" ] -then - echo -e "Add generated files ${grey}(pre-commit hook)${no_color}" - git add setup.py -fi - -popd > /dev/null diff --git a/pyproject.toml b/pyproject.toml index 938205e..1d36fdb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "exasol-script-languages-container-ci-setup" -version = "1.0.0" +version = "1.1.0" description = "Manages AWS cloud CI build infrastructure." license = "MIT" diff --git a/scripts/build/check_git_status.sh b/scripts/build/check_git_status.sh deleted file mode 100755 index 7b8e873..0000000 --- a/scripts/build/check_git_status.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -#Prints git status and returns > 0 if working tree is dirty! If working tree is clean, it returns 0. - -git status --porcelain=v1 -uno -git diff --cached; git diff --cached --summary; -[ -z "$(git status --porcelain=v1 -uno 2>/dev/null)" ] diff --git a/setup.py b/setup.py deleted file mode 100644 index 53827bc..0000000 --- a/setup.py +++ /dev/null @@ -1,40 +0,0 @@ -# -*- coding: utf-8 -*- -from setuptools import setup - -packages = \ -['exasol_script_languages_container_ci_setup', - 'exasol_script_languages_container_ci_setup.cli', - 'exasol_script_languages_container_ci_setup.cli.commands', - 'exasol_script_languages_container_ci_setup.cli.options', - 'exasol_script_languages_container_ci_setup.lib'] - -package_data = \ -{'': ['*'], 'exasol_script_languages_container_ci_setup': ['templates/*']} - -install_requires = \ -['PyGithub>=1.55.0,<2.0.0', - 'boto3>=1.22.0,<2.0.0', - 'click>=8.1.3,<9.0.0', - 'exasol-script-languages-container-ci>=1.0.0,<2.0.0', - 'exasol_error_reporting_python>=0.3.0,<0.4.0', - 'jinja2>=3.1.0', - 'jsonschema>=4.17.3,<5.0.0'] - -setup_kwargs = { - 'name': 'exasol-script-languages-container-ci-setup', - 'version': '1.0.0', - 'description': 'Manages AWS cloud CI build infrastructure.', - 'long_description': 'None', - 'author': 'Thomas Uebensee', - 'author_email': 'ext.thomas.uebensee@exasol.com', - 'maintainer': 'None', - 'maintainer_email': 'None', - 'url': 'None', - 'packages': packages, - 'package_data': package_data, - 'install_requires': install_requires, - 'python_requires': '>=3.8.0,<4.0', -} - - -setup(**setup_kwargs)