Merge branch 'awake' into main

Author: sinoroc

.gitlab-ci.yml

@@ -1,7 +1,7 @@
 ---
 
 
-pages:
+'.common':
   image: 'python:3.6'
   before_script:
     - 'apt-get --assume-yes --quiet update'
@@ -15,11 +15,17 @@ pages:
   script:
     - 'tox -e build'
     - 'cp -r build/html public'
+
+'build':
+  extends: '.common'
+
+pages:
+  extends: '.common'
   artifacts:
     paths:
       - 'public'
   only:
     - 'main'
 
 
-... EOF
+...  # EOF

.travis.yml

@@ -3,6 +3,14 @@
 
 language: 'python'
 
+os:
+  - 'linux'
+
+sudo: false
+
+python:
+  - '3.6'
+
 addons:
   apt:
     packages:

tox.ini

@@ -7,6 +7,7 @@ envlist =
 skipsdist = True
 
 [testenv]
+basepython = python3.6
 commands =
     make
 deps =