A bit of renovation

Author: zgoda

.github/workflows/release.yml

@@ -7,21 +7,15 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/[email protected]
-    - name: Set up Python 3.7
+    - name: Set up Python 3.10
       uses: actions/[email protected]
       with:
-        python-version: 3.7
-    - name: Get pip cache dir
-      id: pip-cache-dir
-      run: echo "::set-output name=dir::$(pip cache dir)"
-    - name: Cache pip
-      uses: actions/[email protected]
-      with:
-        path: ${{ steps.pip-cache-dir.outputs.dir }}
-        key: pip|3.7|${{ hashFiles('setup.py') }}
+        python-version: "3.10"
+        cache: pip
+        cache-dependency-path: setup.py
     - name: Install dependencies
       run: |
         python -m pip install -U pip wheel setuptools

.github/workflows/tests.yml

@@ -8,10 +8,10 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
-        python-version: [3.7, 3.9]
+        python-version: ["3.8", "3.10"]
     steps:
     - uses: actions/[email protected]
     - name: Set up Python ${{ matrix.python-version }}
@@ -28,7 +28,7 @@ jobs:
       run: |
         pytest --cov-branch --cov-report xml --cov bip tests
     - name: Coveralls report
-      if: matrix.python-version == 3.7
+      if: matrix.python-version == "3.10"
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}

setup.py

@@ -105,8 +105,9 @@ def find_version(*where):
         'Natural Language :: Polish',
         'Operating System :: POSIX :: Linux',
         'Programming Language :: Python :: 3 :: Only',
-        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content :: Content Management System',
     ],
     install_requires=base_reqs,
@@ -120,5 +121,5 @@ def find_version(*where):
             'bip=bip.cli:main',
         ]
     },
-    python_requires='~=3.7',
+    python_requires='~=3.8',
 )

src/bip/app.py

@@ -49,6 +49,7 @@ def make_app() -> Application:
     if flask_environment != 'dev':
         app.logger.info(f'BIP application running in mode {flask_environment}')
     configure_app(app)
+    prepare_app(app)
     # setup keyring for headless environments
     if flask_environment in ('production', 'test'):
         keyring.set_keyring(CryptFileKeyring())
@@ -143,23 +144,28 @@ def configure_database(_app: Application) -> None:
     db.init(db_name, **kw)
 
 
+def prepare_app(app: Application) -> None:
+    """Former ``before_first_request`` hook, now standalone function.
+
+    :param app: application object
+    :type app: Application
+    """
+    if os.getenv('FLASK_ENV') == 'test' and not os.getenv('SITE_JSON'):
+        site = test_site()
+    else:
+        site_object_path = os.path.abspath(os.environ['SITE_JSON'])
+        with open(site_object_path) as fp:
+            site = Site.from_json(fp.read())
+    app.site = app.jinja_env.globals['site'] = site
+
+
 def configure_hooks(app: Application) -> None:
     """Set up application lifetime hooks.
 
     :param app: application object
     :type app: Application
     """
 
-    @app.before_first_request
-    def load_site_objects() -> None:
-        if os.getenv('FLASK_ENV') == 'test' and not os.getenv('SITE_JSON'):
-            site = test_site()
-        else:
-            site_object_path = os.path.abspath(os.environ['SITE_JSON'])
-            with open(site_object_path) as fp:
-                site = Site.from_json(fp.read())
-        app.site = app.jinja_env.globals['site'] = site
-
     @app.before_request
     def db_connect() -> None:
         db.connect(reuse_if_open=True)