diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bead0f1..21a083f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,11 +7,24 @@ variables: GITLAB_CI_PYPI_TOX: 'tox~=3.8.0' GITLAB_CI_PYPI_TWINE: 'twine~=1.13.0' stages: + - schema - static - build - test - deploy - trigger +schema: + stage: schema + image: ${GITLAB_CI_IMAGE_PYTHON} + script: + - pip install --no-cache-dir --no-deps -r "requirements.txt" --force-reinstall . + - mkdir satnogs-db-api-client + - ./manage.py generateschema > satnogs-db-api-client/api-schema.yml + artifacts: + expire_in: 1 week + when: always + paths: + - satnogs-db-api-client static_js_css: stage: static image: ${GITLAB_CI_IMAGE_NODE} diff --git a/.yapfignore b/.yapfignore index 1a7abcd..da81543 100644 --- a/.yapfignore +++ b/.yapfignore @@ -1,6 +1,7 @@ node_modules db/_version.py db/*/migrations +satnogs-db-api-client .tox build docs diff --git a/requirements-dev.txt b/requirements-dev.txt index 06bda8e..27711da 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -21,7 +21,7 @@ pluggy==0.13.0 pur==5.2.2 py==1.8.0 pyparsing==2.4.2 -pytest==5.1.3 +pytest==5.2.0 pytest-cov==2.7.1 pytest-django==3.5.1 pytest-forked==1.0.2 diff --git a/requirements.txt b/requirements.txt index d9c28a6..d6b8387 100644 --- a/requirements.txt +++ b/requirements.txt @@ -31,7 +31,7 @@ idna==2.8 importlib-metadata==0.23 influxdb==5.2.3 kaitaistruct==0.8 -kombu==4.6.4 +kombu==4.6.5 lxml==4.4.1 Markdown==3.1.1 monotonic==1.5 @@ -45,6 +45,7 @@ python-decouple==3.1 python-dotenv==0.10.3 python3-openid==3.1.0 pytz==2019.2 +PyYAML==5.1.2 rcssmin==1.0.6 redis==3.3.8 requests==2.22.0 @@ -60,6 +61,7 @@ six==1.12.0 social-auth-app-django==3.1.0 social-auth-core==3.2.0 Unipath==1.1 +uritemplate==3.0.0 urllib3==1.24.3 vine==1.3.0 zipp==0.6.0 diff --git a/setup.cfg b/setup.cfg index fc84138..86dd76f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -61,6 +61,8 @@ install_requires = influxdb~=5.2.0 satnogs-decoders~=1.0 simplejson~=3.16.0 + uritemplate~=3.0.0 + PyYAML~=5.1.0 # Conflict workarounds # django-allauth - sentry-sdk urllib3<1.25 @@ -82,7 +84,7 @@ dev = max-complexity = 23 max-line-length = 99 ignore = F403,W504 -exclude = db/_version.py,versioneer.py,*/migrations,docs,build,.tox,node_modules +exclude = db/_version.py,versioneer.py,*/migrations,docs,build,.tox,node_modules,satnogs-db-api-client [yapf] column_limit = 99 @@ -91,7 +93,7 @@ dedent_closing_brackets = True [tool:isort] use_parentheses = True -skip_glob = migrations,docs,build,.tox,node_modules +skip_glob = migrations,docs,build,.tox,node_modules,satnogs-db-api-client skip = _version.py,versioneer.py known_third_party = factory line_width = 99