Merge pull request #16 from Clariteia/0.0.1

0.0.1

Author: andrea-mucci

.github/workflows/python-docs.yml

@@ -0,0 +1,32 @@
+# This workflow 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: Publish Python Package Documentation
+
+on:
+    release:
+        types: [ created ]
+
+jobs:
+    deploy:
+        runs-on: ubuntu-latest
+        container: python:3.9-buster
+
+        steps:
+            -   name: Check out repository code
+                uses: actions/checkout@v2
+
+            -   name: Install Poetry
+                uses: snok/install-poetry@v1.1.4
+
+            -   name: Install dependencies
+                run: make install
+
+            -   name: Generate documentation
+                run: make docs
+
+            -   name: Deploy documentation
+                uses: peaceiris/actions-gh-pages@v3
+                with:
+                    github_token: ${{ secrets.GITHUB_TOKEN }}
+                    publish_dir: docs/_build/html

.github/workflows/python-publish.yml

@@ -4,26 +4,27 @@
 name: Upload Python Package
 
 on:
-  release:
-    types: [created]
+    release:
+        types: [ created ]
 
 jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    steps:
-    - 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
-    - name: Build and publish
-      env:
-        TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
-        TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
-      run: |
-        python setup.py sdist bdist_wheel
-        twine upload dist/*
+    deploy:
+        runs-on: ubuntu-latest
+        container: python:3.9-buster
+
+        steps:
+
+            -   name: Check out repository code
+                uses: actions/checkout@v2
+
+            -   name: Install Poetry
+                uses: snok/install-poetry@v1.1.4
+
+            -   name: Install dependencies
+                run: make install
+
+            -   name: Publish package
+                run: make release
+                env:
+                    POETRY_HTTP_BASIC_PYPI_USERNAME: ${{ secrets.PYPI_USERNAME }}
+                    POETRY_HTTP_BASIC_PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }}

.github/workflows/python-tests.yml

@@ -1,31 +1,51 @@
 on: push
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    container: python:3.9
-
-    steps:
-    - name: Check out repository code
-      uses: actions/checkout@v2
-
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        if [ -f requirements_dev.txt ]; then pip install -r requirements_dev.txt; fi
-        python setup.py install
-
-    - name: Test with pytest
-      run: |
-        make test
-
-    - name: Generate coverage report
-      run: |
-        make coverage
-
-    - name: Codecov
-      uses: codecov/codecov-action@v1.3.1
-      with:
-         token: ${{ secrets.CODECOV_TOKEN }}
-         files: ./coverage.xml
-         fail_ci_if_error: true
+    build:
+        runs-on: ubuntu-latest
+        container: python:3.9-buster
+
+        # Service containers to run with `container-job`
+        services:
+            # Label used to access the service container
+            redis:
+                # Docker Hub image
+                image: redis
+                # Set health checks to wait until redis has started
+                options: >-
+                    --health-cmd "redis-cli ping"
+                    --health-interval 10s
+                    --health-timeout 5s
+                    --health-retries 5
+        env:
+            DISCOVERY_SERVICE_DB_HOST: redis
+            DISCOVERY_SERVICE_DB_PORT: 6379
+
+        steps:
+            -   name: Check out repository code
+                uses: actions/checkout@v2
+
+            -   name: Install Poetry
+                uses: snok/install-poetry@v1.1.4
+
+            -   name: Install dependencies
+                run: make install
+
+            -   name: Lint package
+                run: make lint
+
+            -   name: Test package with coverage
+                run: make coverage
+
+            -   name: Publish coverage
+                uses: codecov/codecov-action@v1.3.1
+                with:
+                    token: ${{ secrets.CODECOV_TOKEN }}
+                    files: ./coverage.xml
+                    fail_ci_if_error: true
+
+            -   name: Generate documentation
+                run: make docs
+
+            -   name: Generate build
+                run: make dist

.gitignore

@@ -104,4 +104,11 @@ ENV/
 # IDE settings
 .vscode/
 
+# Intellij IDEa / PyCharm / etc.
 .idea
+
+# lmdb database
+*.mdb
+
+# Sphinx Api Documentation
+docs/api

.pre-commit-config.yaml

@@ -0,0 +1,39 @@
+default_stages: [ commit ]
+repos:
+    -   repo: local
+        hooks:
+            -   id: install
+                pass_filenames: false
+                name: Install depencies
+                entry: make install
+                language: system
+
+            -   id: reformat
+                pass_filenames: false
+                name: Reformat package
+                entry: make reformat
+                language: system
+
+            -   id: lint
+                pass_filenames: false
+                name: Lint package
+                entry: make lint
+                language: system
+
+            -   id: test
+                pass_filenames: false
+                name: Test package
+                entry: make test
+                language: system
+
+            -   id: docs
+                pass_filenames: false
+                name: Generate documentation
+                entry: make docs
+                language: system
+
+            -   id: build
+                pass_filenames: false
+                entry: make dist
+                name: Generate build
+                language: system

.restyled.yaml

@@ -0,0 +1,28 @@
+---
+enabled: true
+exclude:
+  - "**/*.md"
+  - ".idea/**/*"
+  - "docs/**/*"
+  - "**/*.in"
+  - "Makefile"
+  - ".github/workflows/**/*"
+restylers:
+  - name: black
+    image: restyled/restyler-black:v19.10b0
+    command:
+      - black
+    arguments: ["--line-length", "120"]
+    include:
+      - "**/*.py"
+    interpreters:
+      - python
+  - name: isort
+    image: restyled/restyler-isort:v5.8.0
+    command:
+      - isort
+    arguments: []
+    include:
+      - "**/*.py"
+    interpreters:
+      - python

HISTORY.md

@@ -1,7 +1,12 @@
 History
 =======
 
-0.0.1 (2021-05-16)
+0.0.1 (2021-05-21)
 ------------------
 
-* First release on PyPI.
+* Added REST Interface for:
+    * subscription
+    * unsubscription
+    * microservice health status update
+    * periodic service for microservice health status check
+* Redis integration

MANIFEST.in

@@ -26,7 +26,7 @@ BROWSER := python -c "$$BROWSER_PYSCRIPT"
 help:
 	@python -c "$$PRINT_HELP_PYSCRIPT" < $(MAKEFILE_LIST)
 
-clean: clean-build clean-pyc clean-test ## remove all build, test, coverage and Python artifacts
+clean: clean-build clean-pyc clean-test clean-env
 
 clean-build: ## remove build artifacts
 	rm -fr build/
@@ -47,38 +47,46 @@ clean-test: ## remove test and coverage artifacts
 	rm -fr htmlcov/
 	rm -fr .pytest_cache
 
+clean-env:
+	rm -fr .env/
+
 lint: ## check style with flake8
-	flake8 minos tests
+	poetry run flake8
 
 test: ## run tests quickly with the default Python
-	pytest
+	poetry run pytest
 
 test-all: ## run tests on every Python version with tox
-	tox
+	poetry run tox
 
 coverage: ## check code coverage quickly with the default Python
-	coverage run --source minos -m pytest
-	coverage report -m
-	coverage xml
+	poetry run coverage run --source minos -m pytest
+	poetry run coverage report -m
+	poetry run coverage xml
+	## $(BROWSER) htmlcov/index.html
+
+reformat: ## check code coverage quickly with the default Python
+	poetry run black --line-length 120 minos tests
+	poetry run isort --recursive minos tests
 
 docs: ## generate Sphinx HTML documentation, including API docs
-	rm -f docs/discovery_service.rst
+	rm -f docs/minos_discovery.rst
 	rm -f docs/modules.rst
-	sphinx-apidoc -o docs/ discovery_service
-	$(MAKE) -C docs clean
-	$(MAKE) -C docs html
-	$(BROWSER) docs/_build/html/index.html
+	poetry run sphinx-apidoc -o docs/api minos
+	poetry run $(MAKE) -C docs clean
+	poetry run $(MAKE) -C docs html
 
 servedocs: docs ## compile the docs watching for changes
 	watchmedo shell-command -p '*.rst' -c '$(MAKE) -C docs html' -R -D .
 
 release: dist ## package and upload a release
-	twine upload dist/*
+	poetry publish
 
 dist: clean ## builds source and wheel package
-	python setup.py sdist
-	python setup.py bdist_wheel
+	poetry build
 	ls -l dist
 
-install: clean ## install the package to the active Python's site-packages
-	python setup.py install
+install:
+	poetry install
+
+full-install: clean install

Makefile

@@ -1,8 +1,7 @@
-=================
 Discovery Service
 =================
 
-Minos Boilerplate contains all the boilerplate you need to create a Minos Python package.
+Minos API Gateway Discovery Service
 
 Credits
 -------