refactor app name, added packaging (2299d2dc) · Commits · NDIP / Remote Data Brokers

.coveragerc

+3 −3

Original line number	Diff line number	Diff line
		[report]
		omit =
		tests/*
		app/brokers/filesys/*
		app/auth/keycloak.py
		app/main.py
		No newline at end of file
		remote_data_broker/brokers/filesys/*
		remote_data_broker/auth/keycloak.py
		remote_data_broker/main.py
		No newline at end of file

.gitignore

+1 −0

Original line number	Diff line number	Diff line
		@@ -7,3 +7,4 @@ __pycache__
		.coverage
		htmlcov
		coverage.xml
		dist
		No newline at end of file

.gitlab-ci.yml

+14 −1

Original line number	Diff line number	Diff line
		@@ -38,7 +38,7 @@ lint:
		poetry run isort --filter-files --check-only --profile black . ;
		poetry run black --check --diff .;
		poetry run flake8 .;
		poetry run pylint app tests;
		poetry run pylint remote_data_broker tests;
		poetry run mypy .
		"
		- docker tag remote-data-broker $CONTAINER_RDM_URL/$CI_COMMIT_REF_NAME:$CI_COMMIT_SHORT_SHA
		@@ -126,3 +126,16 @@ update-latest-tag:
		- docker push $CONTAINER_RDM_URL_PROD/$CI_COMMIT_REF_NAME:latest
		tags:
		- rse-multi-builder

		package:
		stage: update-repo
		script:
		- >
		docker run
		$CONTAINER_RDM_URL_PROD/$CI_COMMIT_REF_NAME:$CI_COMMIT_SHORT_SHA
		bash -c "poetry build &&
		poetry publish -u gitlab-ci-token -p ${CI_JOB_TOKEN} -r ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/pypi
		"
		when: manual
		tags:
		- rse-multi-builder

.pre-commit-config.yaml

+1 −1

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@ repos:
		- id: system
		name: Pylint
		description: use pylint to lint
		entry: poetry run pylint app tests
		entry: poetry run pylint remote_data_broker tests
		pass_filenames: false
		language: system
		- repo: local

poetry.lock

+2 −60

Original line number	Diff line number	Diff line
		# This file is automatically @generated by Poetry and should not be changed by hand.
		# This file is automatically @generated by Poetry 1.5.0 and should not be changed by hand.

		[[package]]
		name = "anyio"
		version = "3.6.2"
		description = "High level compatibility layer for multiple asynchronous event loop implementations"
		category = "main"
		optional = false
		python-versions = ">=3.6.2"
		files = [
		@@ -26,7 +25,6 @@ trio = ["trio (>=0.16,<0.22)"]
		name = "asgiref"
		version = "3.7.1"
		description = "ASGI specs, helper code, and adapters"
		category = "main"
		optional = false
		python-versions = ">=3.7"
		files = [
		@@ -44,7 +42,6 @@ tests = ["mypy (>=0.800)", "pytest", "pytest-asyncio"]
		name = "astroid"
		version = "2.11.7"
		description = "An abstract syntax tree for Python with inference support."
		category = "main"
		optional = false
		python-versions = ">=3.6.2"
		files = [
		@@ -63,7 +60,6 @@ wrapt = ">=1.11,<2"
		name = "atomicwrites"
		version = "1.4.1"
		description = "Atomic file writes."
		category = "dev"
		optional = false
		python-versions = ">=2.7, !=3.0., !=3.1., !=3.2., !=3.3."
		files = [
		@@ -74,7 +70,6 @@ files = [
		name = "attrs"
		version = "23.1.0"
		description = "Classes Without Boilerplate"
		category = "dev"
		optional = false
		python-versions = ">=3.7"
		files = [
		@@ -96,7 +91,6 @@ tests-no-zope = ["cloudpickle", "hypothesis", "mypy (>=1.1.1)", "pympler", "pyte
		name = "black"
		version = "22.12.0"
		description = "The uncompromising code formatter."
		category = "dev"
		optional = false
		python-versions = ">=3.7"
		files = [
		@@ -133,7 +127,6 @@ uvloop = ["uvloop (>=0.15.2)"]
		name = "certifi"
		version = "2023.5.7"
		description = "Python package for providing Mozilla's CA Bundle."
		category = "main"
		optional = false
		python-versions = ">=3.6"
		files = [
		@@ -145,7 +138,6 @@ files = [
		name = "cfgv"
		version = "3.3.1"
		description = "Validate configuration and produce human readable error messages."
		category = "dev"
		optional = false
		python-versions = ">=3.6.1"
		files = [
		@@ -157,7 +149,6 @@ files = [
		name = "charset-normalizer"
		version = "3.1.0"
		description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet."
		category = "main"
		optional = false
		python-versions = ">=3.7.0"
		files = [
		@@ -242,7 +233,6 @@ files = [
		name = "click"
		version = "8.1.3"
		description = "Composable command line interface toolkit"
		category = "main"
		optional = false
		python-versions = ">=3.7"
		files = [
		@@ -258,7 +248,6 @@ importlib-metadata = {version = "*", markers = "python_version < \"3.8\""}
		name = "colorama"
		version = "0.4.6"
		description = "Cross-platform colored terminal text."
		category = "main"
		optional = false
		python-versions = "!=3.0.,!=3.1.,!=3.2.,!=3.3.,!=3.4.,!=3.5.,!=3.6.*,>=2.7"
		files = [
		@@ -270,7 +259,6 @@ files = [
		name = "coverage"
		version = "7.2.6"
		description = "Code coverage measurement for Python"
		category = "dev"
		optional = false
		python-versions = ">=3.7"
		files = [
		@@ -337,7 +325,6 @@ toml = ["tomli"]
		name = "dill"
		version = "0.3.6"
		description = "serialize all of python"
		category = "main"
		optional = false
		python-versions = ">=3.7"
		files = [
		@@ -352,7 +339,6 @@ graph = ["objgraph (>=1.7.2)"]
		name = "distlib"
		version = "0.3.6"
		description = "Distribution utilities"
		category = "dev"
		optional = false
		python-versions = "*"
		files = [
		@@ -364,7 +350,6 @@ files = [
		name = "fastapi"
		version = "0.78.0"
		description = "FastAPI framework, high performance, easy to learn, fast to code, ready for production"
		category = "main"
		optional = false
		python-versions = ">=3.6.1"
		files = [
		@@ -386,7 +371,6 @@ test = ["anyio[trio] (>=3.2.1,<4.0.0)", "black (==22.3.0)", "databases[sqlite] (
		name = "filelock"
		version = "3.12.0"
		description = "A platform independent file lock."
		category = "dev"
		optional = false
		python-versions = ">=3.7"
		files = [
		@@ -402,7 +386,6 @@ testing = ["covdefaults (>=2.3)", "coverage (>=7.2.3)", "diff-cover (>=7.5)", "p
		name = "flake8"
		version = "4.0.1"
		description = "the modular source code checker: pep8 pyflakes and co"
		category = "dev"
		optional = false
		python-versions = ">=3.6"
		files = [
		@@ -420,7 +403,6 @@ pyflakes = ">=2.4.0,<2.5.0"
		name = "h11"
		version = "0.14.0"
		description = "A pure-Python, bring-your-own-I/O implementation of HTTP/1.1"
		category = "main"
		optional = false
		python-versions = ">=3.7"
		files = [
		@@ -435,7 +417,6 @@ typing-extensions = {version = "*", markers = "python_version < \"3.8\""}
		name = "identify"
		version = "2.5.24"
		description = "File identification library for Python"
		category = "dev"
		optional = false
		python-versions = ">=3.7"
		files = [
		@@ -450,7 +431,6 @@ license = ["ukkonen"]
		name = "idna"
		version = "3.4"
		description = "Internationalized Domain Names in Applications (IDNA)"
		category = "main"
		optional = false
		python-versions = ">=3.5"
		files = [
		@@ -462,7 +442,6 @@ files = [
		name = "importlib-metadata"
		version = "4.2.0"
		description = "Read metadata from Python packages"
		category = "main"
		optional = false
		python-versions = ">=3.6"
		files = [
		@@ -482,7 +461,6 @@ testing = ["flufl.flake8", "importlib-resources (>=1.3)", "packaging", "pep517",
		name = "iniconfig"
		version = "2.0.0"
		description = "brain-dead simple config-ini parsing"
		category = "dev"
		optional = false
		python-versions = ">=3.7"
		files = [
		@@ -494,7 +472,6 @@ files = [
		name = "isort"
		version = "5.11.5"
		description = "A Python utility / library to sort Python imports."
		category = "main"
		optional = false
		python-versions = ">=3.7.0"
		files = [
		@@ -512,7 +489,6 @@ requirements-deprecated-finder = ["pip-api", "pipreqs"]
		name = "lazy-object-proxy"
		version = "1.9.0"
		description = "A fast and thorough lazy object proxy."
		category = "main"
		optional = false
		python-versions = ">=3.7"
		files = [
		@@ -558,7 +534,6 @@ files = [
		name = "mccabe"
		version = "0.6.1"
		description = "McCabe checker, plugin for flake8"
		category = "main"
		optional = false
		python-versions = "*"
		files = [
		@@ -570,7 +545,6 @@ files = [
		name = "mypy"
		version = "0.950"
		description = "Optional static typing for Python"
		category = "dev"
		optional = false
		python-versions = ">=3.6"
		files = [
		@@ -614,7 +588,6 @@ reports = ["lxml"]
		name = "mypy-extensions"
		version = "1.0.0"
		description = "Type system extensions for programs checked with the mypy type checker."
		category = "dev"
		optional = false
		python-versions = ">=3.5"
		files = [
		@@ -626,7 +599,6 @@ files = [
		name = "nodeenv"
		version = "1.8.0"
		description = "Node.js virtual environment builder"
		category = "dev"
		optional = false
		python-versions = ">=2.7,!=3.0.,!=3.1.,!=3.2.,!=3.3.,!=3.4.,!=3.5.,!=3.6.*"
		files = [
		@@ -641,7 +613,6 @@ setuptools = "*"
		name = "packaging"
		version = "23.1"
		description = "Core utilities for Python packages"
		category = "dev"
		optional = false
		python-versions = ">=3.7"
		files = [
		@@ -653,7 +624,6 @@ files = [
		name = "pathspec"
		version = "0.11.1"
		description = "Utility library for gitignore style pattern matching of file paths."
		category = "dev"
		optional = false
		python-versions = ">=3.7"
		files = [
		@@ -665,7 +635,6 @@ files = [
		name = "platformdirs"
		version = "2.6.2"
		description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
		category = "main"
		optional = false
		python-versions = ">=3.7"
		files = [
		@@ -684,7 +653,6 @@ test = ["appdirs (==1.4.4)", "covdefaults (>=2.2.2)", "pytest (>=7.2)", "pytest-
		name = "pluggy"
		version = "1.0.0"
		description = "plugin and hook calling mechanisms for python"
		category = "dev"
		optional = false
		python-versions = ">=3.6"
		files = [
		@@ -703,7 +671,6 @@ testing = ["pytest", "pytest-benchmark"]
		name = "pre-commit"
		version = "2.21.0"
		description = "A framework for managing and maintaining multi-language pre-commit hooks."
		category = "dev"
		optional = false
		python-versions = ">=3.7"
		files = [
		@@ -723,7 +690,6 @@ virtualenv = ">=20.10.0"
		name = "py"
		version = "1.11.0"
		description = "library with cross-python path, ini-parsing, io, code, log facilities"
		category = "dev"
		optional = false
		python-versions = ">=2.7, !=3.0., !=3.1., !=3.2., !=3.3., !=3.4.*"
		files = [
		@@ -735,7 +701,6 @@ files = [
		name = "pycodestyle"
		version = "2.8.0"
		description = "Python style guide checker"
		category = "dev"
		optional = false
		python-versions = ">=2.7, !=3.0., !=3.1., !=3.2., !=3.3., !=3.4.*"
		files = [
		@@ -747,7 +712,6 @@ files = [
		name = "pydantic"
		version = "1.10.8"
		description = "Data validation and settings management using python type hints"
		category = "main"
		optional = false
		python-versions = ">=3.7"
		files = [
		@@ -800,7 +764,6 @@ email = ["email-validator (>=1.0.3)"]
		name = "pyflakes"
		version = "2.4.0"
		description = "passive checker of Python programs"
		category = "dev"
		optional = false
		python-versions = ">=2.7, !=3.0., !=3.1., !=3.2., !=3.3."
		files = [
		@@ -812,7 +775,6 @@ files = [
		name = "pyjwt"
		version = "2.7.0"
		description = "JSON Web Token implementation in Python"
		category = "main"
		optional = false
		python-versions = ">=3.7"
		files = [
		@@ -833,7 +795,6 @@ tests = ["coverage[toml] (==5.0.4)", "pytest (>=6.0.0,<7.0.0)"]
		name = "pylint"
		version = "2.13.9"
		description = "python code static checker"
		category = "main"
		optional = false
		python-versions = ">=3.6.2"
		files = [
		@@ -858,7 +819,6 @@ testutil = ["gitpython (>3)"]
		name = "pytest"
		version = "6.2.5"
		description = "pytest: simple powerful testing with Python"
		category = "dev"
		optional = false
		python-versions = ">=3.6"
		files = [
		@@ -884,7 +844,6 @@ testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "requests", "xm
		name = "pytest-cov"
		version = "3.0.0"
		description = "Pytest plugin for measuring coverage."
		category = "dev"
		optional = false
		python-versions = ">=3.6"
		files = [
		@@ -903,7 +862,6 @@ testing = ["fields", "hunter", "process-tests", "pytest-xdist", "six", "virtuale
		name = "pyyaml"
		version = "6.0"
		description = "YAML parser and emitter for Python"
		category = "dev"
		optional = false
		python-versions = ">=3.6"
		files = [
		@@ -953,7 +911,6 @@ files = [
		name = "requests"
		version = "2.31.0"
		description = "Python HTTP for Humans."
		category = "main"
		optional = false
		python-versions = ">=3.7"
		files = [
		@@ -975,7 +932,6 @@ use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"]
		name = "setuptools"
		version = "67.8.0"
		description = "Easily download, build, install, upgrade, and uninstall Python packages"
		category = "main"
		optional = false
		python-versions = ">=3.7"
		files = [
		@@ -992,7 +948,6 @@ testing-integration = ["build[virtualenv]", "filelock (>=3.4.0)", "jaraco.envs (
		name = "sniffio"
		version = "1.3.0"
		description = "Sniff out which async library your code is running under"
		category = "main"
		optional = false
		python-versions = ">=3.7"
		files = [
		@@ -1004,7 +959,6 @@ files = [
		name = "starlette"
		version = "0.19.1"
		description = "The little ASGI library that shines."
		category = "main"
		optional = false
		python-versions = ">=3.6"
		files = [
		@@ -1023,7 +977,6 @@ full = ["itsdangerous", "jinja2", "python-multipart", "pyyaml", "requests"]
		name = "toml"
		version = "0.10.2"
		description = "Python Library for Tom's Obvious, Minimal Language"
		category = "dev"
		optional = false
		python-versions = ">=2.6, !=3.0., !=3.1., !=3.2.*"
		files = [
		@@ -1035,7 +988,6 @@ files = [
		name = "tomli"
		version = "2.0.1"
		description = "A lil' TOML parser"
		category = "main"
		optional = false
		python-versions = ">=3.7"
		files = [
		@@ -1047,7 +999,6 @@ files = [
		name = "tomlkit"
		version = "0.11.8"
		description = "Style preserving TOML library"
		category = "dev"
		optional = false
		python-versions = ">=3.7"
		files = [
		@@ -1059,7 +1010,6 @@ files = [
		name = "typed-ast"
		version = "1.5.4"
		description = "a fork of Python 2 and 3 ast modules with type comment support"
		category = "main"
		optional = false
		python-versions = ">=3.6"
		files = [
		@@ -1093,7 +1043,6 @@ files = [
		name = "types-requests"
		version = "2.31.0.0"
		description = "Typing stubs for requests"
		category = "dev"
		optional = false
		python-versions = "*"
		files = [
		@@ -1108,7 +1057,6 @@ types-urllib3 = "*"
		name = "types-urllib3"
		version = "1.26.25.13"
		description = "Typing stubs for urllib3"
		category = "dev"
		optional = false
		python-versions = "*"
		files = [
		@@ -1120,7 +1068,6 @@ files = [
		name = "typing-extensions"
		version = "4.6.2"
		description = "Backported and Experimental Type Hints for Python 3.7+"
		category = "main"
		optional = false
		python-versions = ">=3.7"
		files = [
		@@ -1132,7 +1079,6 @@ files = [
		name = "urllib3"
		version = "2.0.2"
		description = "HTTP library with thread-safe connection pooling, file post, and more."
		category = "main"
		optional = false
		python-versions = ">=3.7"
		files = [
		@@ -1150,7 +1096,6 @@ zstd = ["zstandard (>=0.18.0)"]
		name = "uvicorn"
		version = "0.17.6"
		description = "The lightning-fast ASGI server."
		category = "main"
		optional = false
		python-versions = ">=3.7"
		files = [
		@@ -1171,7 +1116,6 @@ standard = ["PyYAML (>=5.1)", "colorama (>=0.4)", "httptools (>=0.4.0)", "python
		name = "virtualenv"
		version = "20.16.2"
		description = "Virtual Python Environment builder"
		category = "dev"
		optional = false
		python-versions = ">=3.6"
		files = [
		@@ -1193,7 +1137,6 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
		name = "wrapt"
		version = "1.15.0"
		description = "Module for decorators, wrappers and monkey patching."
		category = "main"
		optional = false
		python-versions = "!=3.0.,!=3.1.,!=3.2.,!=3.3.,!=3.4.*,>=2.7"
		files = [
		@@ -1278,7 +1221,6 @@ files = [
		name = "zipp"
		version = "3.15.0"
		description = "Backport of pathlib-compatible object wrapper for zip files"
		category = "main"
		optional = false
		python-versions = ">=3.7"
		files = [
		@@ -1293,4 +1235,4 @@ testing = ["big-O", "flake8 (<5)", "jaraco.functools", "jaraco.itertools", "more
		[metadata]
		lock-version = "2.0"
		python-versions = ">=3.7,<3.11"
		content-hash = "8cbefc56cca386d7001ee378661642d509d0202ffd594b2b16dd5d0c32cebcb6"
		content-hash = "03ef69a1c8479f1716bdff5977822c32e1e6baecb5e7524c87834e3bfb09686d"