Commit 388187f9 authored by Adrian DC's avatar Adrian DC
Browse files

ci(gitlab-ci, setup): migrate to 'src' sources management 

Signed-off-by: default avatarAdrian DC <radian.dc@gmail.com>
parent 2fad2300

.gitlab-ci.yml

+10 −10
Changes for .gitlab-ci.yml: 10 added lines, 10 removed lines.
Original line number Diff line number Diff line
@@ -60,17 +60,17 @@ codestyle: 
  stage: prepare

  image: registry.gitlab.com/adriandc/gitlabci-local/gitlabci-local:codestyle

  script:

    - yapf -i ./gitlab_projects_settings/*.py ./gitlab_projects_settings/*/*.py ./setup.py

    - unify -i --quote "'" ./gitlab_projects_settings/*.py ./gitlab_projects_settings/*/*.py ./setup.py

    - yapf -i ./src/*.py ./src/*/*.py ./setup.py

    - unify -i --quote "'" ./src/*.py ./src/*/*.py ./setup.py

    - echo '' && git diff --name-status

    - git diff --quiet

  rules:

    - if: $CI_COMMIT_REF_NAME == "develop"

      changes:

        - 'CHANGELOG.md'

        - 'gitlab_projects_settings/**/*'

        - 'requirements/**/*'

        - 'setup.py'

        - 'src/**/*'

    - if: $CI_COMMIT_TAG || $CI_PIPELINE_SOURCE == "trigger" || $CI_PIPELINE_SOURCE == "web" || $CI_COMMIT_REF_NAME != "develop"

      when: on_success

  allow_failure: true
@@ -83,15 +83,15 @@ lint: 
  before_script:

    - pip3 install -q -r ./requirements/runtime.txt --upgrade

  script:

    - pylint --errors-only ./gitlab_projects_settings/ ./setup.py

    - pylint --disable=missing-docstring --load-plugins=pylint.extensions.no_self_use ./gitlab_projects_settings/ ./setup.py

    - pylint --errors-only ./src/ ./setup.py

    - pylint --disable=missing-docstring --load-plugins=pylint.extensions.no_self_use ./src/ ./setup.py

  rules:

    - if: $CI_COMMIT_REF_NAME == "develop"

      changes:

        - 'CHANGELOG.md'

        - 'gitlab_projects_settings/**/*'

        - 'requirements/**/*'

        - 'setup.py'

        - 'src/**/*'

    - if: $CI_COMMIT_TAG || $CI_PIPELINE_SOURCE == "trigger" || $CI_PIPELINE_SOURCE == "web" || $CI_COMMIT_REF_NAME != "develop"

      when: on_success

  allow_failure: true
@@ -106,17 +106,17 @@ typings: 
    - set +x

    - |

      if [ $(git rev-list --count HEAD) -gt 1 ]; then

        mypy --follow-imports silent --pretty $(git diff --name-only $(git diff --exit-code >/dev/null && echo 'HEAD^' || echo 'HEAD') ./gitlab_projects_settings/ ./setup.py) 2>/dev/null || true

        mypy --follow-imports silent --pretty $(git diff --name-only $(git diff --exit-code >/dev/null && echo 'HEAD^' || echo 'HEAD') ./src/ ./setup.py) 2>/dev/null || true

      fi

    - sleep 1

    - mypy --follow-imports silent --pretty ./gitlab_projects_settings/ ./setup.py

    - mypy --follow-imports silent --pretty ./src/ ./setup.py

  rules:

    - if: $CI_COMMIT_REF_NAME == "develop"

      changes:

        - 'CHANGELOG.md'

        - 'gitlab_projects_settings/**/*'

        - 'requirements/**/*'

        - 'setup.py'

        - 'src/**/*'

    - if: $CI_COMMIT_TAG || $CI_PIPELINE_SOURCE == "trigger" || $CI_PIPELINE_SOURCE == "web" || $CI_COMMIT_REF_NAME != "develop"

      when: on_success

  allow_failure: true
@@ -137,8 +137,8 @@ build: 
    - if: $CI_COMMIT_REF_NAME == "develop"

      changes:

        - 'CHANGELOG.md'

        - 'gitlab_projects_settings/**/*'

        - 'requirements/**/*'

        - 'src/**/*'

    - if: $CI_COMMIT_TAG || $CI_PIPELINE_SOURCE == "trigger" || $CI_PIPELINE_SOURCE == "web" || $CI_COMMIT_REF_NAME != "develop"

      when: on_success

  artifacts:

setup.py

+15 −5
Changes for setup.py: 15 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -23,14 +23,14 @@ PROJECT_EMAIL = 'radian.dc@gmail.com' 
PROJECT_KEYWORDS = 'gitlab issues sync'

PROJECT_NAME = 'gitlab-projects-settings'

PROJECT_OWNER = 'AdrianDC'

PROJECT_PACKAGE = 'gitlab-projects-settings'

PROJECT_PACKAGE = 'gitlab_projects_settings'

PROJECT_SCRIPTS = [

    'gitlab-projects-settings = gitlab_projects_settings.cli.main:main',

]



# Setup configurations

setup(

    name=PROJECT_PACKAGE,

    name=PROJECT_NAME,

    use_scm_version=True,

    author=PROJECT_AUTHOR,

    author_email=PROJECT_EMAIL,
@@ -42,11 +42,21 @@ setup( 
    project_urls={

        'Bug Reports': f'https://gitlab.com/{PROJECT_OWNER}/{PROJECT_NAME}/-/issues',

        'Changelog': f'https://gitlab.com/{PROJECT_OWNER}/{PROJECT_NAME}/blob/main/CHANGELOG.md',

        'Documentation': f'https://gitlab.com/{PROJECT_OWNER}/{PROJECT_NAME}#{PROJECT_PACKAGE}',

        'Documentation': f'https://gitlab.com/{PROJECT_OWNER}/{PROJECT_NAME}#{PROJECT_NAME}',

        'Source': f'https://gitlab.com/{PROJECT_OWNER}/{PROJECT_NAME}',

        'Statistics': f'https://pypistats.org/packages/{PROJECT_PACKAGE}'

        'Statistics': f'https://pypistats.org/packages/{PROJECT_NAME}'

    },

    packages=[

        PROJECT_PACKAGE,

    ] + [

        f'{PROJECT_PACKAGE}.{module}' for module in find_packages(

            where='src',

            exclude=['tests'],

        )

    ],

    package_dir={

        PROJECT_PACKAGE: 'src',

    },

    packages=find_packages(exclude=['tests']),

    setup_requires=['setuptools_scm'],

    install_requires=requirements,

    classifiers=[