resilience

.github/workflows/black.yml

@@ -6,20 +6,20 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.8]
+        python-version: [3.11]
 
     steps:
       # git checkout
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       # python setup
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
       # python cache
-      - uses: actions/cache@v1
+      - uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}

.github/workflows/flake8.yml

@@ -6,20 +6,20 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.8]
+        python-version: [3.11]
 
     steps:
       # git checkout
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       # python setup
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
       # python cache
-      - uses: actions/cache@v1
+      - uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}

.github/workflows/pyroma.yml

@@ -6,20 +6,20 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.8]
+        python-version: [3.11]
 
     steps:
       # git checkout
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       # python setup
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
       # python cache
-      - uses: actions/cache@v1
+      - uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}

.github/workflows/test.yml

@@ -13,20 +13,20 @@ jobs:
       matrix:
         config:
         # [Python version, tox env]
-        - ["3.8",  "py38-plone52"]
-        - ["3.8",  "py38-plone60"]
+        # - ["3.8",  "py38-plone52"]
+        # - ["3.8",  "py38-plone60"]
         - ["3.9",  "py39-plone60"]
         - ["3.10",  "py310-plone60"]
         - ["3.11",  "py311-plone60"]
     name: ${{ matrix.config[1] }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.config[0] }}
     - name: Pip cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: |
           ~/.cache/pip

.github/workflows/zpretty.yml

@@ -6,20 +6,20 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.8]
+        python-version: [3.11]
 
     steps:
       # git checkout
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       # python setup
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
       # python cache
-      - uses: actions/cache@v1
+      - uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}

.gitignore

@@ -32,6 +32,7 @@ report.html
 .vscode/
 .tox/
 reports/
+pyvenv.cfg
 # excludes
 !.coveragerc
 !.editorconfig

README.rst

@@ -115,6 +115,22 @@ Install redturtle.rssservice by adding it to your buildout::
 
 and then running ``bin/buildout``
 
+Resilience
+==========
+
+To make the product more resilient against external feed disruptions, it is possible to use an external proxy/cache service. The service is utilized in the following format:
+
+```
+http://proxyservice/http://feedurl
+```
+
+The product includes a built-in proxy/cache implementation that can be used. After installing the product, you can use it by running the following process:
+
+```
+bin/rssmixer-proxy --port 8000 --ttl 1200
+```
+
+And eventually set the environment variable `RSSMIXER_PROXY` to `http://127.0.0.1:8000` according to the port used for the proxy.
 
 Contribute
 ==========

base.cfg

@@ -1,7 +1,7 @@
 [buildout]
 show-picked-versions = true
-extensions =
-    mr.developer
+#extensions =
+#    mr.developer
 
 parts =
     instance
@@ -14,7 +14,7 @@ parts =
 #    releaser
     i18ndude
     omelette
-    robot
+#    robot
     plone-helper-scripts
     vscode
 
@@ -65,6 +65,7 @@ eggs = coverage
 recipe = collective.recipe.template
 input = inline:
     #!/bin/bash
+    set -e
     export TZ=UTC
     ${buildout:directory}/bin/coverage run bin/test $*
     ${buildout:directory}/bin/coverage html

buildout.cfg

@@ -1,8 +1,6 @@
 [buildout]
-
 # use this extend one of the buildout configuration:
 extends =
     test_plone60.cfg
 
 [versions]
-setuptools = 

requirements.txt

@@ -1,3 +1 @@
--c constraints.txt
-setuptools
-zc.buildout
+-r requirements_plone60.txt

requirements_plone60.txt

@@ -1,13 +1 @@
-# Keep these the same as in base.cfg please.
-pip==22.2.2
-setuptools==65.3.0
-zc.buildout>=3.0.0rc3
-wheel==0.37.1
-
-# Windows specific down here (has to be installed here, fails in buildout)
-# Dependency of zope.sendmail:
-pywin32 ; platform_system == 'Windows'
-# SSL Certs on Windows, because Python is missing them otherwise:
-certifi ; platform_system == 'Windows'
-# Dependency of collective.recipe.omelette:
-ntfsutils ; platform_system == 'Windows' and python_version < '3.0'
+-r https://dist.plone.org/release/6.0-latest/requirements.txt

setup.cfg

@@ -6,13 +6,7 @@ ignore =
     .gitattributes
 
 [isort]
-# for details see
-# http://docs.plone.org/develop/styleguide/python.html#grouping-and-sorting
-force_alphabetical_sort = True
-force_single_line = True
-lines_after_imports = 2
-line_length = 200
-not_skip = __init__.py
+profile=plone
 
 [flake8]
 exclude = bootstrap.py,docs,*.egg.,omelette
@@ -21,4 +15,4 @@ max-line-length = 100000
 extend-ignore =
     E203,
     C901,
-    C101
+    C101

setup.py

@@ -76,6 +76,6 @@
     [z3c.autoinclude.plugin]
     target = plone
     [console_scripts]
-    update_locale = redturtle.rssservice.locales.update:update_locale
+    rssmixer-proxy = redturtle.rssservice.proxycacheserver:main
     """,
 )

src/redturtle/rssservice/proxycacheserver/__init__.py

@@ -0,0 +1 @@
+from .main import main  # NOQA