Updates for Gitlab CI
* Change docker image * Delete unused problemsmerge-requests/397/head
Nikos Roussos
parent
09d8479326
commit
e98f3a470d
33
.coveragerc
33
.coveragerc
|
|
@ -1,33 +1,8 @@
|
|||
[run]
|
||||
include =
|
||||
network/*
|
||||
network/base/*
|
||||
network/users/*
|
||||
network/api/*
|
||||
base/management/*
|
||||
base/management/commands/*
|
||||
base/templatetags/*
|
||||
source = network
|
||||
|
||||
[report]
|
||||
exclude_lines =
|
||||
pragma: no cover
|
||||
|
||||
# Don't complain about missing debug-only code:
|
||||
def __unicode__
|
||||
def __repr__
|
||||
if self\.debug
|
||||
|
||||
# Don't complain if tests don't hit defensive assertion code:
|
||||
raise AssertionError
|
||||
raise NotImplementedError
|
||||
|
||||
# Don't complain if non-runnable code isn't run:
|
||||
if 0:
|
||||
if __name__ == .__main__.:
|
||||
|
||||
omit =
|
||||
settings/*
|
||||
*/migrations/*
|
||||
|
||||
omit = network/*/tests.py
|
||||
network/settings.py
|
||||
network/*/migrations/*
|
||||
show_missing = True
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,14 @@
|
|||
image: fedora:latest
|
||||
image: registry.gitlab.com/librespacefoundation/satnogs/satnogs-network:latest
|
||||
|
||||
stages:
|
||||
- test
|
||||
|
||||
before_script:
|
||||
- cp env-dist .env
|
||||
|
||||
test:
|
||||
stage: test
|
||||
script:
|
||||
- dnf -y install python-pip python-devel git gcc libjpeg-turbo-devel libxml2-devel libxslt-devel mysql-devel mysql npm redhat-rpm-config
|
||||
- pip install --no-cache-dir --require-hashes --no-deps -r requirements/dev.txt
|
||||
- npm install -g eslint stylelint
|
||||
- flake8 .
|
||||
- pytest
|
||||
- eslint 'network/static/js/*.js'
|
||||
|
|
|
|||
12
.pyup.yml
12
.pyup.yml
|
|
@ -1,12 +0,0 @@
|
|||
# Full list of options at https://pyup.io/docs/configuration/
|
||||
update: all
|
||||
pin: True
|
||||
branch: dev
|
||||
schedule: "every week on friday"
|
||||
search: False
|
||||
requirements:
|
||||
- requirements/production.txt
|
||||
assignees: comzeradd
|
||||
branch_prefix: pyup-
|
||||
pr_prefix: "[update]"
|
||||
close_prs: True
|
||||
16
.travis.yml
16
.travis.yml
|
|
@ -1,16 +0,0 @@
|
|||
language: python
|
||||
dist: trusty
|
||||
notifications:
|
||||
email: false
|
||||
python:
|
||||
- 2.7
|
||||
install:
|
||||
- pip install -r requirements/dev.txt
|
||||
- npm install -g eslint stylelint
|
||||
script:
|
||||
- flake8 .
|
||||
- pytest
|
||||
- eslint 'network/static/js/*.js'
|
||||
- stylelint 'network/static/css/*.css'
|
||||
after_success:
|
||||
- coveralls
|
||||
12
Dockerfile
12
Dockerfile
|
|
@ -1,13 +1,11 @@
|
|||
FROM centos:7
|
||||
RUN yum makecache
|
||||
RUN yum -y install epel-release
|
||||
RUN yum -y install python python-pip python-devel git gcc libjpeg-turbo-devel \
|
||||
libxml2-devel libxslt-devel mysql-devel mysql
|
||||
RUN yum -y clean all
|
||||
RUN pip install --upgrade pip
|
||||
FROM fedora:latest
|
||||
RUN dnf -y install python python-pip python-devel git gcc libjpeg-turbo-devel findutils \
|
||||
libxml2-devel libxslt-devel mysql-devel mysql npm redhat-rpm-config
|
||||
RUN dnf -y clean all
|
||||
|
||||
COPY ./requirements/ /tmp/requirements/
|
||||
RUN pip install --no-cache-dir --require-hashes --no-deps -r /tmp/requirements/dev.txt
|
||||
RUN npm install -g eslint stylelint
|
||||
|
||||
WORKDIR /app
|
||||
COPY . /app
|
||||
|
|
|
|||
15
README.md
15
README.md
|
|
@ -4,24 +4,23 @@ SatNOGS Network is a web application, implementing a global scheduling and monit
|
|||
|
||||
It features multiple observers to multiple intrumentation functionality and manages observation jobs and results.
|
||||
|
||||
## Install and Contribute
|
||||
## Contribute
|
||||
|
||||
See the [documentation](http://docs.satnogs.org/en/stable/network/).
|
||||
Check out the [documentation](https://docs.satnogs.org/en/stable/satnogs-network/docs/) on how to setup a local development instance.
|
||||
|
||||
The main repository lives on [Gitlab](https://gitlab.com/librespacefoundation/satnogs/satnogs-network).
|
||||
The main repository lives on [Gitlab](https://gitlab.com/librespacefoundation/satnogs/satnogs-network) and all Merge Request should happen there.
|
||||
|
||||
## Join
|
||||
|
||||
[](https://riot.im/app/#/room/#satnogs:matrix.org)
|
||||
[](https://webchat.freenode.net/?channels=satnogs)
|
||||
[](https://community.satnogs.org/)
|
||||
[](https://community.libre.space/c/satnogs)
|
||||
|
||||
## Current Development
|
||||
|
||||
[](https://gitlab.com/librespacefoundation/satnogs/satnogs-network/boards/345495)
|
||||
[](http://travis-ci.org/satnogs/satnogs-network/)
|
||||
[](https://coveralls.io/github/satnogs/satnogs-network)
|
||||
[](https://pyup.io/repos/github/satnogs/satnogs-network/)
|
||||
[](https://pyup.io/repos/github/satnogs/satnogs-network/)
|
||||
[](https://gitlab.com/librespacefoundation/satnogs/satnogs-network/commits/dev)
|
||||
[](https://gitlab.com/librespacefoundation/satnogs/satnogs-network/commits/cleanup)
|
||||
|
||||
## License
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@ THIRD_PARTY_APPS = (
|
|||
'allauth.account',
|
||||
'compressor',
|
||||
'csp',
|
||||
'opbeat.contrib.django',
|
||||
)
|
||||
LOCAL_APPS = (
|
||||
'network.users',
|
||||
|
|
@ -36,6 +35,10 @@ LOCAL_APPS = (
|
|||
)
|
||||
|
||||
INSTALLED_APPS = DJANGO_APPS + THIRD_PARTY_APPS + LOCAL_APPS
|
||||
if ENVIRONMENT == 'production':
|
||||
INSTALLED_APPS += (
|
||||
'opbeat.contrib.django',
|
||||
)
|
||||
|
||||
# Middlware
|
||||
MIDDLEWARE = (
|
||||
|
|
@ -47,9 +50,12 @@ MIDDLEWARE = (
|
|||
'django.middleware.clickjacking.XFrameOptionsMiddleware',
|
||||
'django.middleware.security.SecurityMiddleware',
|
||||
'csp.middleware.CSPMiddleware',
|
||||
'opbeat.contrib.django.middleware.OpbeatAPMMiddleware',
|
||||
'opbeat.contrib.django.middleware.Opbeat404CatchMiddleware',
|
||||
)
|
||||
if ENVIRONMENT == 'production':
|
||||
MIDDLEWARE += (
|
||||
'opbeat.contrib.django.middleware.OpbeatAPMMiddleware',
|
||||
'opbeat.contrib.django.middleware.Opbeat404CatchMiddleware',
|
||||
)
|
||||
|
||||
# Email
|
||||
if DEBUG:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
[pytest]
|
||||
addopts = -v --cov --cov-report term-missing
|
||||
python_files = tests.py
|
||||
DJANGO_SETTINGS_MODULE=network.settings.dev
|
||||
DJANGO_SETTINGS_MODULE=network.settings
|
||||
|
|
|
|||
Loading…
Reference in New Issue