Updates for Gitlab CI

* Change docker image
* Delete unused problems

.coveragerc

@@ -1,33 +1,8 @@
 [run]
-include =
+source = network
-    network/*
-    network/base/*
-    network/users/*
-    network/api/*
-    base/management/*
-    base/management/commands/*
-    base/templatetags/*
 
 [report]
-exclude_lines = 
+omit = network/*/tests.py
-    pragma: no cover
+       network/settings.py
-
+       network/*/migrations/*
-    # 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/*
-
 show_missing = True
-

.gitlab-ci.yml

@@ -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'

.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

.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

Dockerfile

@@ -1,13 +1,11 @@
-FROM centos:7
+FROM fedora:latest
-RUN yum makecache
+RUN dnf -y install python python-pip python-devel git gcc libjpeg-turbo-devel findutils \
-RUN yum -y install epel-release
+                   libxml2-devel libxslt-devel mysql-devel mysql npm redhat-rpm-config
-RUN yum -y install python python-pip python-devel git gcc libjpeg-turbo-devel \
+RUN dnf -y clean all
-                   libxml2-devel libxslt-devel mysql-devel mysql
-RUN yum -y clean all
-RUN pip install --upgrade pip
 
 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

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
 
+[![irc](https://img.shields.io/badge/Matrix-%23satnogs:matrix.org-blue.svg)](https://riot.im/app/#/room/#satnogs:matrix.org)
 [![irc](https://img.shields.io/badge/IRC-%23satnogs%20on%20freenode-blue.svg)](https://webchat.freenode.net/?channels=satnogs)
-[![irc](https://img.shields.io/badge/forum-discourse-blue.svg)](https://community.satnogs.org/)
+[![irc](https://img.shields.io/badge/forum-discourse-blue.svg)](https://community.libre.space/c/satnogs)
 
 ## Current Development
 
 [![kanban](https://img.shields.io/badge/kanban-board-lightgray.svg)](https://gitlab.com/librespacefoundation/satnogs/satnogs-network/boards/345495)
-[![travis](https://img.shields.io/travis/satnogs/satnogs-network/dev.svg?label=tests)](http://travis-ci.org/satnogs/satnogs-network/)
+[![build](https://gitlab.com/librespacefoundation/satnogs/satnogs-network/badges/dev/build.svg)](https://gitlab.com/librespacefoundation/satnogs/satnogs-network/commits/dev)
-[![coveralls](https://img.shields.io/coveralls/satnogs/satnogs-network/dev.svg)](https://coveralls.io/github/satnogs/satnogs-network)
+[![coverage](https://gitlab.com/librespacefoundation/satnogs/satnogs-network/badges/cleanup/coverage.svg)](https://gitlab.com/librespacefoundation/satnogs/satnogs-network/commits/cleanup)
-[![updates](https://pyup.io/repos/github/satnogs/satnogs-network/shield.svg)](https://pyup.io/repos/github/satnogs/satnogs-network/)
-[![Python 3](https://pyup.io/repos/github/satnogs/satnogs-network/python-3-shield.svg)](https://pyup.io/repos/github/satnogs/satnogs-network/)
 
 ## License
 

network/settings.py

@@ -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:

pytest.ini

@@ -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