change doc reqs

.gitlab-ci.yml

@@ -31,10 +31,10 @@ tests (from scratch):
     - base
     - zam347
   stage: test
-  #only:
-  #  - master
-  #  - /^release.*$/
-  #  - develop
+  only:
+    - master
+    - /^release.*$/
+    - develop
   variables:
     FAILURE_THRESHOLD: 100
     TEST_TYPE: "scratch"
@@ -44,7 +44,6 @@ tests (from scratch):
     - source /opt/venv/bin/activate
   script:
     - pip install --upgrade pip
-    #    - pip install numpy wheel six==1.15.0
     - zypper --no-gpg-checks addrepo https://download.opensuse.org/repositories/Application:Geo/15.4/Application:Geo.repo
     - zypper --no-gpg-checks refresh
     - zypper --no-gpg-checks --non-interactive install proj=8.2.1
@@ -52,9 +51,6 @@ tests (from scratch):
     - zypper --no-gpg-checks --non-interactive install geos-devel=3.9.1
     - zypper --no-gpg-checks --non-interactive install libproj22=8.2.1
     - zypper --no-gpg-checks --non-interactive install binutils libproj-devel gdal-devel
-    #    - zypper --non-interactive install binutils libproj-devel gdal-devel
-    #    - zypper --non-interactive install proj geos-devel
-    #    - cat requirements.txt | cut -f1 -d"#" | sed '/^\s*$/d' | xargs -L 1 pip install
     - pip install -r requirements.txt
     - chmod +x ./CI/run_pytest.sh
     - ./CI/run_pytest.sh
@@ -67,35 +63,7 @@ tests (from scratch):
     paths:
       - badges/
       - test_results/
-
-### Tests (on GPU) ###
-#tests (on GPU):
-#  tags:
-#    - gpu
-#    - zam347
-#  stage: test
-#  only:
-#    - master
-#    - /^release.*$/
-#    - develop
-#  variables:
-#    FAILURE_THRESHOLD: 100
-#    TEST_TYPE: "gpu"
-#  before_script:
-#    - chmod +x ./CI/update_badge.sh
-#    - ./CI/update_badge.sh > /dev/null
-#  script:
-#    - pip install -r test/requirements_tf_skip.txt
-#    - chmod +x ./CI/run_pytest.sh
-#    - ./CI/run_pytest.sh
-#  after_script:
-#    - ./CI/update_badge.sh > /dev/null
-#  artifacts:
-#    name: pages
-#    when: always
-#    paths:
-#      - badges/
-#      - test_results/
+      -
 
 ### Tests ###
 tests:

docs/requirements_docs.txt

@@ -2,8 +2,8 @@ sphinx==3.0.3
 sphinx-autoapi==1.8.4
 sphinx-autodoc-typehints==1.12.0
 sphinx-rtd-theme==0.4.3
-#recommonmark==0.6.0
 m2r2==0.3.1
 docutils<0.18
 mistune==0.8.4
-setuptools>=59.5.0
\ No newline at end of file
+setuptools>=59.5.0
+Jinja2<3.1
\ No newline at end of file