From e6dcbbf3323a62deaea6a8d0a89f7d9a22322f69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20M=C3=A9rigot?= Date: Thu, 10 Jan 2019 17:59:11 +0100 Subject: [PATCH 1/2] syntax: rename package to djangoldp_notification (singular) --- djangoldp_notification/__init__.py | 1 + {djangoldp_notifications => djangoldp_notification}/admin.py | 0 djangoldp_notification/apps.py | 4 ++++ .../migrations/0001_initial.py | 0 .../migrations/__init__.py | 0 {djangoldp_notifications => djangoldp_notification}/models.py | 0 {djangoldp_notifications => djangoldp_notification}/urls.py | 0 djangoldp_notifications/__init__.py | 1 - djangoldp_notifications/apps.py | 4 ---- 9 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 djangoldp_notification/__init__.py rename {djangoldp_notifications => djangoldp_notification}/admin.py (100%) create mode 100644 djangoldp_notification/apps.py rename {djangoldp_notifications => djangoldp_notification}/migrations/0001_initial.py (100%) rename {djangoldp_notifications => djangoldp_notification}/migrations/__init__.py (100%) rename {djangoldp_notifications => djangoldp_notification}/models.py (100%) rename {djangoldp_notifications => djangoldp_notification}/urls.py (100%) delete mode 100644 djangoldp_notifications/__init__.py delete mode 100644 djangoldp_notifications/apps.py diff --git a/djangoldp_notification/__init__.py b/djangoldp_notification/__init__.py new file mode 100644 index 0000000..2c9c914 --- /dev/null +++ b/djangoldp_notification/__init__.py @@ -0,0 +1 @@ +name = "djangoldp_notification" diff --git a/djangoldp_notifications/admin.py b/djangoldp_notification/admin.py similarity index 100% rename from djangoldp_notifications/admin.py rename to djangoldp_notification/admin.py diff --git a/djangoldp_notification/apps.py b/djangoldp_notification/apps.py new file mode 100644 index 0000000..934aba1 --- /dev/null +++ b/djangoldp_notification/apps.py @@ -0,0 +1,4 @@ +from django.apps import AppConfig + +class DjangoldpNotificationConfig(AppConfig): + name = 'djangoldp_notification' diff --git a/djangoldp_notifications/migrations/0001_initial.py b/djangoldp_notification/migrations/0001_initial.py similarity index 100% rename from djangoldp_notifications/migrations/0001_initial.py rename to djangoldp_notification/migrations/0001_initial.py diff --git a/djangoldp_notifications/migrations/__init__.py b/djangoldp_notification/migrations/__init__.py similarity index 100% rename from djangoldp_notifications/migrations/__init__.py rename to djangoldp_notification/migrations/__init__.py diff --git a/djangoldp_notifications/models.py b/djangoldp_notification/models.py similarity index 100% rename from djangoldp_notifications/models.py rename to djangoldp_notification/models.py diff --git a/djangoldp_notifications/urls.py b/djangoldp_notification/urls.py similarity index 100% rename from djangoldp_notifications/urls.py rename to djangoldp_notification/urls.py diff --git a/djangoldp_notifications/__init__.py b/djangoldp_notifications/__init__.py deleted file mode 100644 index 8f85b58..0000000 --- a/djangoldp_notifications/__init__.py +++ /dev/null @@ -1 +0,0 @@ -name = "djangoldp_notifications" \ No newline at end of file diff --git a/djangoldp_notifications/apps.py b/djangoldp_notifications/apps.py deleted file mode 100644 index 014d0a3..0000000 --- a/djangoldp_notifications/apps.py +++ /dev/null @@ -1,4 +0,0 @@ -from django.apps import AppConfig - -class DjangoldpNotificationsConfig(AppConfig): - name = 'djangoldp_notifications' From b33249d29c6287d820811422ef9ee1a35347d3ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20M=C3=A9rigot?= Date: Thu, 10 Jan 2019 18:00:42 +0100 Subject: [PATCH 2/2] feature: install ci/cd --- .gitlab-ci.yml | 30 ++++++++++++++++++++++++++++++ djangoldp_notification/__init__.py | 1 + setup.cfg | 18 ++++++++++++++++++ setup.py | 16 +++------------- 4 files changed, 52 insertions(+), 13 deletions(-) create mode 100644 .gitlab-ci.yml create mode 100644 setup.cfg diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..137fb38 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,30 @@ +--- +image: python:3.6 + +stages: + - test + - release + +test: + stage: test + script: + - echo 'Make your tests here !' + except: + - master + tags: + - sib + +publish: + stage: release + before_script: + - git config user.name "${GITLAB_USER_NAME}" + - git config user.email "${GITLAB_USER_EMAIL}" + - git remote set-url origin "https://gitlab-ci-token:${GL_TOKEN}@git.happy-dev.fr/${CI_PROJECT_PATH}.git" + - pip install git+https://github.com/plup/python-semantic-release + - pip install sib-commit-parser + script: + - semantic-release publish + only: + - master + tags: + - sib diff --git a/djangoldp_notification/__init__.py b/djangoldp_notification/__init__.py index 2c9c914..c6f830d 100644 --- a/djangoldp_notification/__init__.py +++ b/djangoldp_notification/__init__.py @@ -1 +1,2 @@ +__version__ = '0.0.0' name = "djangoldp_notification" diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..5c2b9d4 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,18 @@ +[metadata] +name = djangoldp_notification +version = attr: djangoldp_notification.__version__ +url = https://git.happy-dev.fr/startinblox/djangoldp-packages/djangoldp-notifications +author = Startin'blox +author_email = matthieu@happy-dev.fr +description = djangoldp package for notifications data models +license = MIT + +[options] +packages = find: +install_requires = + djangoldp~=0.5 + +[semantic_release] +version_source = tag +version_variable = djangoldp_profile/__init__.py:__version__ +commit_parser = commit_parser.parse diff --git a/setup.py b/setup.py index 18760ef..beda28e 100644 --- a/setup.py +++ b/setup.py @@ -1,15 +1,5 @@ -import os -from setuptools import setup, find_packages +#!/usr/bin/env python -# allow setup.py to be run from any path -os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir))) +from setuptools import setup -setup(name='djangoldp_notifications', - version='0.0.1', - description='djangoldp package for notifications data models', - url='https://git.happy-dev.fr/startinblox/djangoldp-packages/djangoldp-notifications', - author="Startin'blox", - author_email='matthieu@happy-dev.fr', - license='MIT', - packages=find_packages(), - zip_safe=False) +setup()