Merge branch 'develop' of https://github.com/DOAJ/doaj into feature/2…

…407_sitemap_generator

# Conflicts:
#	portality/view/doaj.py

.circleci/config.yml

@@ -7,7 +7,7 @@ jobs:
   build-and-test:
 
     docker:
-      - image: cimg/python:3.8.10
+      - image: cimg/python:3.10
         environment:
           DOAJENV: test
       - image: cimg/redis:6.2.14

.github/workflows/main.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   gen_docs:
-    name: generate DOAJ documentation and fuctional tests and push to the docs repo
+    name: generate DOAJ documentation and functional tests and push to the docs repo
     runs-on: ubuntu-latest
     permissions:
       contents: write
@@ -16,22 +16,22 @@ jobs:
 
     steps:
       - name: checkout the branch of interest
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with: 
           path: doaj
 
       - name: checkout the documentation repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: doaj-docs
           repository: DOAJ/doaj-docs
           token: ${{ secrets.STEVE_PAT_DOAJ_ACTIONS_DOCS }}
           fetch-depth: 0
 
-      - name: set up a python 3.8 environment
-        uses: actions/setup-python@v4.4.0
+      - name: set up a python 3.10 environment
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: '3.10'
 
       - name: install elasticsearch
         uses: getong/[email protected]

.gitignore

@@ -28,6 +28,7 @@ htmlcov/*
 # Don't push our dev configs or the secret app configs.
 dev.cfg
 app.cfg
+instance.cfg
 
 # directories of transient stuff that gets created locally
 media/*

.python-version

@@ -1 +1 @@
-3.8.10
+3.10