updated manual theme + README

hydroffice · May 4, 2024 · 5d6aa1a · 5d6aa1a
1 parent 6fb1761
commit 5d6aa1a
Show file tree

Hide file tree

Showing 7 changed files with 99 additions and 14 deletions.
diff --git a/.github/workflows/bag_on_linux.yml b/.github/workflows/bag_on_linux.yml
@@ -0,0 +1,43 @@
+name: BAG on Linux
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      max-parallel: 5
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python 3.11
+      uses: actions/setup-python@v4
+      with:
+        python-version: 3.11
+    - name: setup-conda
+      uses: s-weigand/setup-conda@v1.2.1
+      with:
+        update-conda: true
+        python-version: 3.11
+    - name: Install dependencies
+      run: |
+        conda config --add channels conda-forge
+        conda install appdirs cartopy gdal matplotlib-base numpy psutil pyproj qt-material hyo2.abc2
+        pip install PySide6
+        sudo apt-get install -y libegl1
+        pip install --no-deps .
+    - name: Lint with flake8
+      run: |
+        conda install flake8
+        # stop the build if there are Python syntax errors or undefined names
+        flake8 .\hyo2\bag --count --select=E9,F63,F7,F82 --show-source --statistics
+        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+        flake8 .\hyo2\bag --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+      continue-on-error: true
+    - name: Test with pytest
+      run: |
+        pip install coveralls PyYAML pytest pytest-cov
+        py.test --cov
+        coverage report -m
+        coveralls
+      continue-on-error: false
diff --git a/.github/workflows/bag_on_windows.yml b/.github/workflows/bag_on_windows.yml
@@ -0,0 +1,42 @@
+name: BAG on Windows
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: windows-latest
+    strategy:
+      max-parallel: 5
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python 3.11
+      uses: actions/setup-python@v4
+      with:
+        python-version: 3.11
+    - name: setup-conda
+      uses: s-weigand/setup-conda@v1.2.1
+      with:
+        update-conda: true
+        python-version: 3.11
+    - name: Install dependencies
+      run: |
+        conda config --add channels conda-forge
+        conda install appdirs cartopy gdal matplotlib-base numpy psutil pyproj qt-material hyo2.abc2
+        pip install PySide6
+        pip install --no-deps .
+    - name: Lint with flake8
+      run: |
+        conda install flake8
+        # stop the build if there are Python syntax errors or undefined names
+        flake8 .\hyo2\bag --count --select=E9,F63,F7,F82 --show-source --statistics
+        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+        flake8 .\hyo2\bag --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+      continue-on-error: true
+    - name: Test with pytest
+      run: |
+        pip install coveralls PyYAML pytest pytest-cov
+        py.test --cov
+        coverage report -m
+        coveralls
+      continue-on-error: false
diff --git a/README.rst b/README.rst
@@ -10,18 +10,18 @@ HydrOffice BAG Tools
     :target: https://pypi.python.org/pypi/hyo2.bag
     :alt: PyPi version
 
+.. image:: https://github.com/hydroffice/hyo2_bag/actions/workflows/bag_on_windows.yml/badge.svg
+    :target: https://github.com/hydroffice/hyo2_bag/actions/workflows/bag_on_windows.yml
+    :alt: Windows
+
+.. image:: https://github.com/hydroffice/hyo2_bag/actions/workflows/bag_on_linux.yml/badge.svg
+    :target: https://github.com/hydroffice/hyo2_bag/actions/workflows/bag_on_linux.yml
+    :alt: Linux
+
 .. image:: https://img.shields.io/badge/docs-latest-brightgreen.svg
     :target: https://www.hydroffice.org/manuals/bag/index.html
     :alt: Latest Documentation
 
-.. image:: https://travis-ci.org/hydroffice/hyo2_bag.svg?branch=master
-    :target: https://travis-ci.org/hydroffice/hyo2_bag
-    :alt: Travis-CI Status
-
-.. image:: https://ci.appveyor.com/api/projects/status/88t4ry78yqw5ejak?svg=true
-    :target: https://ci.appveyor.com/project/giumas/hyo2-bag
-    :alt: AppVeyor Status
-
 .. image:: https://api.codacy.com/project/badge/Grade/c7551d8f90ba4b0086c7b8dc81376260
     :target: https://www.codacy.com/app/hydroffice/hyo2_bag/dashboard
     :alt: codacy

diff --git a/docs/_theme/hyo2/static/hyo2.css_t → docs/_theme/qc4/static/hyo2.css_t b/docs/_theme/hyo2/static/hyo2.css_t → docs/_theme/qc4/static/hyo2.css_t
@@ -2,8 +2,8 @@
  * hyo2.css_t
  */
 
-{% set light_noaa = '#007ec6' %}
-{% set dark_hydroffice = '#235b8c' %}
+{% set light_noaa = '#c66300' %}
+{% set dark_hydroffice = '#C49B00' %}
 {% set dark_blue = '#164670' %}
 {% set blue = '#235b8c' %}
 {% set light_blue = '#368dd9' %}
@@ -13,7 +13,7 @@
 {% set very_light_orange = '#e5dfd5' %}
 {% set black = '#1a2126' %}
 {% set light_black = '#3e4549' %}
-{% set very_light_black = '#cccdce' %}
+{% set very_light_black = '#b6b7b8' %}
 {% set page_width = 965 %}
 {% set sidebar_width = 165 %}
 {% set body_font_stack = 'Optima, Segoe, "Segoe UI", Candara, Calibri, Arial, sans-serif' %}
@@ -227,7 +227,7 @@ div.body p, div.body dd, div.body li {
 }
 
 div.admonition {
-    background: #fafafa;
+    background: #FDFDF0;
     margin: 20px -30px;
     padding: 10px 30px;
     border-top: 1px solid #ccc;

diff --git a/docs/_theme/hyo2/theme.conf → docs/_theme/qc4/theme.conf b/docs/_theme/hyo2/theme.conf → docs/_theme/qc4/theme.conf
diff --git a/docs/conf.py b/docs/conf.py
@@ -110,7 +110,7 @@
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 
-html_theme = 'hyo2'
+html_theme = 'qc4'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the

diff --git a/setup.py b/setup.py
@@ -65,7 +65,7 @@ def find_version(*file_paths):
         "wheel",
     ],
     install_requires=[
-        "hyo2.abc2",
+        "hyo2.abc2>=2.3.7",
         "lxml",
         "numpy",
         "gdal",