Commit 07f56ca9 authored by Adrian DC's avatar Adrian DC
Browse files

fix(setup): resolve project package and name usage 

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

.gitlab-ci.yml

+2 −2
Changes for .gitlab-ci.yml: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ readme: 
    - |

      export COLUMNS=120

      mkdir -p ./.tmp/

      PACKAGE_NAME=$(grep '^PROJECT_NAME =' ./setup.py | cut -d"'" -f2)

      PROJECT_PACKAGE=$(grep '^PROJECT_PACKAGE =' ./setup.py | cut -d"'" -f2)

      {

        echo ''

        echo '```yaml'
@@ -278,7 +278,7 @@ readme: 
        separator='--'

        word='[[:alnum:]_-]\{1,\}'

        help="[(]\{0,1\}${word}"

        "${PACKAGE_NAME}" --help \

        "${PROJECT_PACKAGE}" --help \

          | sed '1d; $d' \

          | sed "s/^\(  ${parameter} \[${word}\]${alignments}\)/\1# /g" \

          | sed "s/^\(  ${parameter}\( ${word}\)\{1,\}${alignments}\)/\1# /g" \

setup.py

+7 −6
Changes for setup.py: 7 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -22,9 +22,10 @@ PROJECT_DESCRIPTION = 'Configure GitLab groups and projects settings automatical 
PROJECT_EMAIL = 'radian.dc@gmail.com'

PROJECT_KEYWORDS = 'gitlab projects issues sync'

PROJECT_LICENSE = 'Apache License 2.0'

PROJECT_MODULE = 'gitlab_projects_settings'

PROJECT_NAME = 'gitlab-projects-settings'

PROJECT_NAMESPACE = 'RadianDevCore/tools'

PROJECT_PACKAGE = 'gitlab_projects_settings'

PROJECT_PACKAGE = 'gitlab-projects-settings'

PROJECT_SCRIPTS = [

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

]
@@ -32,7 +33,7 @@ PROJECT_URL = f'https://gitlab.com/{PROJECT_NAMESPACE}/{PROJECT_NAME}' 


# Setup configurations

setup(

    name=PROJECT_NAME,

    name=PROJECT_PACKAGE,

    use_scm_version=True,

    author=PROJECT_AUTHOR,

    author_email=PROJECT_EMAIL,
@@ -46,18 +47,18 @@ setup( 
        'Changelog': f'{PROJECT_URL}/blob/main/CHANGELOG.md',

        'Documentation': f'{PROJECT_URL}#{PROJECT_NAME}',

        'Source': f'{PROJECT_URL}',

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

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

    },

    packages=[

        PROJECT_PACKAGE,

        PROJECT_MODULE,

    ] + [

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

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

            where='src',

            exclude=['tests'],

        )

    ],

    package_dir={

        PROJECT_PACKAGE: 'src',

        PROJECT_MODULE: 'src',

    },

    setup_requires=['setuptools_scm'],

    install_requires=requirements,