Merge pull request #42 from ilri/renovate/pytest-7.x-lockfile

Update dependency pytest to v7.4.4

.drone.yml

@@ -4,7 +4,7 @@ name: python310
 
 steps:
 - name: setup
-  image: postgres:10-alpine
+  image: postgres:15-alpine
   environment:
     PGPASSWORD: postgres
   commands:
@@ -30,7 +30,7 @@ steps:
 
 services:
 - name: database
-  image: postgres:10-alpine
+  image: postgres:15-alpine
   environment:
     POSTGRES_USER: postgres
     POSTGRES_PASSWORD: postgres
@@ -43,7 +43,7 @@ name: python39
 
 steps:
 - name: setup
-  image: postgres:10-alpine
+  image: postgres:15-alpine
   environment:
     PGPASSWORD: postgres
   commands:
@@ -69,7 +69,7 @@ steps:
 
 services:
 - name: database
-  image: postgres:10-alpine
+  image: postgres:15-alpine
   environment:
     POSTGRES_USER: postgres
     POSTGRES_PASSWORD: postgres
@@ -82,7 +82,7 @@ name: python38
 
 steps:
 - name: database
-  image: postgres:10-alpine
+  image: postgres:15-alpine
   detach: true
   environment:
     POSTGRES_USER: postgres
@@ -90,7 +90,7 @@ steps:
     POSTGRES_DB: dspacestatistics
 
 - name: setup
-  image: postgres:10-alpine
+  image: postgres:15-alpine
   environment:
     PGPASSWORD: postgres
   commands:
@@ -114,82 +114,4 @@ steps:
   - pip install -r requirements-dev.txt
   - pytest
 
----
-kind: pipeline
-type: docker
-name: python37
-
-steps:
-- name: database
-  image: postgres:10-alpine
-  detach: true
-  environment:
-    POSTGRES_USER: postgres
-    POSTGRES_PASSWORD: postgres
-    POSTGRES_DB: dspacestatistics
-
-- name: setup
-  image: postgres:10-alpine
-  environment:
-    PGPASSWORD: postgres
-  commands:
-  - id
-  - psql --version
-  - sleep 5
-  - pg_isready -h database -U postgres -d dspacestatistics
-  - createuser -h database -U postgres dspacestatistics
-  - psql -h database -U postgres -c "ALTER USER dspacestatistics WITH PASSWORD 'dspacestatistics'"
-  - psql -h database -U postgres -d dspacestatistics < tests/dspacestatistics.sql
-
-- name: test
-  image: python:3.7-slim
-  environment:
-    PGPASSWORD: dspacestatistics
-    DATABASE_HOST: database
-  commands:
-  - id
-  - python -V
-  - apt update && apt install -y gcc git libpq-dev
-  - pip install -r requirements-dev.txt
-  - pytest
-
----
-kind: pipeline
-type: docker
-name: python36
-
-steps:
-- name: database
-  image: postgres:10-alpine
-  detach: true
-  environment:
-    POSTGRES_USER: postgres
-    POSTGRES_PASSWORD: postgres
-    POSTGRES_DB: dspacestatistics
-
-- name: setup
-  image: postgres:10-alpine
-  environment:
-    PGPASSWORD: postgres
-  commands:
-  - id
-  - psql --version
-  - sleep 5
-  - pg_isready -h database -U postgres -d dspacestatistics
-  - createuser -h database -U postgres dspacestatistics
-  - psql -h database -U postgres -c "ALTER USER dspacestatistics WITH PASSWORD 'dspacestatistics'"
-  - psql -h database -U postgres -d dspacestatistics < tests/dspacestatistics.sql
-
-- name: test
-  image: python:3.6-slim
-  environment:
-    PGPASSWORD: dspacestatistics
-    DATABASE_HOST: database
-  commands:
-  - id
-  - python -V
-  - apt update && apt install -y gcc git libpq-dev
-  - pip install -r requirements-dev.txt
-  - pytest
-
 # vim: ts=2 sw=2 et

.github/workflows/python-app.yml

@@ -8,11 +8,11 @@ on: ['push', 'pull_request']
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     services:
       database:
-        image: postgres:10-alpine
+        image: postgres:15-alpine
         env:
           # password for postgres user in the Docker container
           POSTGRES_PASSWORD: postgres
@@ -27,23 +27,20 @@ jobs:
           - 5432:5432
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python 3.10
-      uses: actions/setup-python@v2
+    - uses: actions/checkout@v4
+    - name: Install poetry
+      run: pipx install poetry
+    - uses: actions/setup-python@v5
       with:
-        python-version: '3.10'
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install flake8 pytest
-        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
-        if [ -f requirements-dev.txt ]; then pip install -r requirements-dev.txt; fi
+        python-version: '3.11'
+        cache: 'poetry'
+    - run: poetry install
     - name: Lint with flake8
       run: |
         # stop the build if there are Python syntax errors or undefined names
-        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+        poetry run flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
         # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+        poetry run flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
     - name: Set up PostgreSQL
       run: |
         pg_isready -U postgres -d dspacestatistics
@@ -55,7 +52,7 @@ jobs:
         PGPASSWORD: postgres
     - name: Test with pytest
       run: |
-        pytest
+        poetry run pytest
       env:
         PGHOST: localhost
         PGPASSWORD: dspacestatistics

.hound.yml

@@ -1,4 +0,0 @@
-flake8:
-    enabled: true
-    config_file: .flake8
-    fail_on_violations: true

CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+### Changed
+- Update recommended Python version to 3.7+
+- Use PostgreSQL 12 in CI
+
+### Updated
+- Falcon 3.1.1
+
 ## 1.4.3 - 2022-03-26
 ### Updated
 - Update dependencies with `poetry update`

README.md

@@ -20,7 +20,7 @@ If you use the DSpace Statistics API please cite:
 
 ## Requirements
 
-- Python 3.6+
+- Python 3.8+
 - PostgreSQL version 9.5+ (due to [`UPSERT` support](https://wiki.postgresql.org/wiki/UPSERT))
 - DSpace with [Solr usage statistics enabled](https://wiki.lyrasis.org/display/DSDOC5x/SOLR+Statistics) (tested with 5.8+ and 6.3)
 

dspace_statistics_api/app.py

@@ -90,7 +90,7 @@ class AllStatisticsResource:
                 )
 
                 # create a list to hold dicts of stats
-                statistics = list()
+                statistics = []
 
                 # iterate over results and build statistics object
                 for result in cursor:
@@ -162,7 +162,7 @@ class AllStatisticsResource:
         )
 
         # create a list to hold dicts of stats
-        statistics = list()
+        statistics = []
 
         # iterate over views dict to extract views and use the element id as an
         # index to the downloads dict to extract downloads.

dspace_statistics_api/config.py

@@ -18,6 +18,6 @@ DATABASE_PORT = os.environ.get("DATABASE_PORT", "5432")
 # the vanilla DSpace REST API.
 DSPACE_STATISTICS_API_URL = os.environ.get("DSPACE_STATISTICS_API_URL", "")
 
-VERSION = "1.4.3"
+VERSION = "1.4.4-dev"
 
 # vim: set sw=4 ts=4 expandtab:

dspace_statistics_api/docs/openapi.json

@@ -1,7 +1,7 @@
 {
   "openapi": "3.0.3",
   "info": {
-    "version": "1.4.3",
+    "version": "1.4.4-dev",
     "title": "DSpace Statistics API",
     "description": "A [Falcon-based](https://falcon.readthedocs.io/) web application to make DSpace's item, community, and collection statistics available via a simple REST API. This Swagger interface is powered by [falcon-swagger-ui](https://github.com/rdidyk/falcon-swagger-ui).",
     "license": {

dspace_statistics_api/util.py

@@ -62,7 +62,6 @@ def get_statistics_shards():
 
 
 def is_valid_date(date):
-
     try:
         # Solr date format is: 2020-01-01T00:00:00Z
         # See: https://docs.python.org/3/library/datetime.html#strftime-strptime-behavior
@@ -141,7 +140,7 @@ def validate_post_parameters(req, resp, resource, params):
                 description=f'The "{req.context.statistics_scope}" parameter is invalid. The value must be a comma-separated list of UUIDs.',
             )
     else:
-        req.context.elements = list()
+        req.context.elements = []
 
 
 def set_statistics_scope(req, resp, resource, params):

pyproject.toml

@@ -1,24 +1,29 @@
 [tool.poetry]
 name = "dspace-statistics-api"
-version = "1.4.3"
+version = "1.4.4-dev"
 description = "A simple REST API to expose Solr view and download statistics for items, communities, and collections in a DSpace repository."
 authors = ["Alan Orth <aorth@mjanja.ch>"]
 license = "GPL-3.0-only"
 
 [tool.poetry.dependencies]
-python = "^3.6"
-gunicorn = "^20.0.4"
-falcon = "3.1.0"
+python = "^3.8.1"
+gunicorn = "^21.0.0"
+falcon = "3.1.3"
 psycopg2 = "^2.9.1"
 requests = "^2.24.0"
 falcon-swagger-ui = {git = "https://github.com/alanorth/falcon-swagger-ui.git", rev="falcon3-update-swagger-ui"}
 
-[tool.poetry.dev-dependencies]
-flake8 = "^4.0.1"
-pytest = "^6.1.1"
-black = {version = "^22.1.0", python = ">=3.6.2"}
-isort = {version = "^5.9.1", python = ">=3.6.1"}
+[tool.poetry.group.dev.dependencies]
+black = "^23.0.0"
+fixit = "^2.1.0"
+flake8 = "^7.0.0"
+isort = "^5.9.1"
+pytest = "^7.0.0"
 
 [build-system]
 requires = ["poetry>=0.12"]
 build-backend = "poetry.masonry.api"
+
+[tool.isort]
+profile = "black"
+line_length=88

renovate.json

@@ -0,0 +1,9 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base"
+  ],
+  "pip_requirements": {
+      "enabled": false
+  }
+}

requirements-dev.txt

@@ -1,37 +1,33 @@
-atomicwrites==1.4.0; python_version >= "3.6" and python_full_version < "3.0.0" and sys_platform == "win32" or sys_platform == "win32" and python_version >= "3.6" and python_full_version >= "3.4.0"
-attrs==21.4.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6"
-black==22.1.0; python_full_version >= "3.6.2"
-certifi==2021.10.8; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0"
-charset-normalizer==2.0.12; python_full_version >= "3.6.0" and python_version >= "3"
-click==8.0.4; python_version >= "3.6" and python_full_version >= "3.6.2"
-colorama==0.4.4; sys_platform == "win32" and python_version >= "3.6" and python_full_version >= "3.6.2" and platform_system == "Windows"
-dataclasses==0.8; python_version >= "3.6" and python_version < "3.7" and python_full_version >= "3.6.2"
-falcon-swagger-ui @ git+https://github.com/alanorth/falcon-swagger-ui.git@falcon3-update-swagger-ui
-falcon==3.1.0; python_version >= "3.5"
-flake8==4.0.1; python_version >= "3.6"
-gunicorn==20.1.0; python_version >= "3.5"
-idna==3.3; python_version >= "3.5" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.5"
-importlib-metadata==4.2.0; python_version < "3.8" and python_version >= "3.6" and python_full_version >= "3.6.2"
-iniconfig==1.1.1; python_version >= "3.6"
-isort==5.10.1; python_full_version >= "3.6.1"
-jinja2==3.0.3; python_version >= "3.6"
-markupsafe==2.0.1; python_version >= "3.6"
-mccabe==0.6.1; python_version >= "3.6"
-mypy-extensions==0.4.3; python_full_version >= "3.6.2"
-packaging==21.3; python_version >= "3.6"
-pathspec==0.9.0; python_full_version >= "3.6.2"
-platformdirs==2.4.0; python_version >= "3.6" and python_full_version >= "3.6.2"
-pluggy==1.0.0; python_version >= "3.6"
-psycopg2==2.9.3; python_version >= "3.6"
-py==1.11.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6"
-pycodestyle==2.8.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6"
-pyflakes==2.4.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6"
-pyparsing==3.0.7; python_version >= "3.6"
-pytest==6.2.5; python_version >= "3.6"
-requests==2.27.1; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.6.0")
-toml==0.10.2; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "3.6"
-tomli==1.2.3; python_version >= "3.6" and python_full_version >= "3.6.2"
-typed-ast==1.5.2; python_version < "3.8" and implementation_name == "cpython" and python_full_version >= "3.6.2" and python_version >= "3.6"
-typing-extensions==4.1.1; python_version < "3.8" and python_full_version >= "3.6.2" and python_version >= "3.6"
-urllib3==1.26.9; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version < "4"
-zipp==3.6.0; python_version < "3.8" and python_version >= "3.6"
+atomicwrites==1.4.1 ; python_version >= "3.8" and python_version < "4.0" and sys_platform == "win32"
+attrs==23.1.0 ; python_version >= "3.8" and python_version < "4.0"
+black==22.12.0 ; python_version >= "3.8" and python_version < "4.0"
+certifi==2023.5.7 ; python_version >= "3.8" and python_version < "4.0"
+charset-normalizer==3.1.0 ; python_version >= "3.8" and python_version < "4.0"
+click==8.1.3 ; python_version >= "3.8" and python_version < "4.0"
+colorama==0.4.6 ; python_version >= "3.8" and python_version < "4.0" and (sys_platform == "win32" or platform_system == "Windows")
+falcon-swagger-ui @ git+https://github.com/alanorth/falcon-swagger-ui.git@falcon3-update-swagger-ui ; python_version >= "3.8" and python_version < "4.0"
+falcon==3.1.1 ; python_version >= "3.8" and python_version < "4.0"
+flake8==4.0.1 ; python_version >= "3.8" and python_version < "4.0"
+gunicorn==20.1.0 ; python_version >= "3.8" and python_version < "4.0"
+idna==3.4 ; python_version >= "3.8" and python_version < "4.0"
+iniconfig==2.0.0 ; python_version >= "3.8" and python_version < "4.0"
+isort==5.12.0 ; python_version >= "3.8" and python_version < "4.0"
+jinja2==3.1.2 ; python_version >= "3.8" and python_version < "4.0"
+markupsafe==2.1.2 ; python_version >= "3.8" and python_version < "4.0"
+mccabe==0.6.1 ; python_version >= "3.8" and python_version < "4.0"
+mypy-extensions==1.0.0 ; python_version >= "3.8" and python_version < "4.0"
+packaging==23.1 ; python_version >= "3.8" and python_version < "4.0"
+pathspec==0.11.1 ; python_version >= "3.8" and python_version < "4.0"
+platformdirs==3.5.1 ; python_version >= "3.8" and python_version < "4.0"
+pluggy==1.0.0 ; python_version >= "3.8" and python_version < "4.0"
+psycopg2==2.9.6 ; python_version >= "3.8" and python_version < "4.0"
+py==1.11.0 ; python_version >= "3.8" and python_version < "4.0"
+pycodestyle==2.8.0 ; python_version >= "3.8" and python_version < "4.0"
+pyflakes==2.4.0 ; python_version >= "3.8" and python_version < "4.0"
+pytest==6.2.5 ; python_version >= "3.8" and python_version < "4.0"
+requests==2.31.0 ; python_version >= "3.8" and python_version < "4.0"
+setuptools==67.8.0 ; python_version >= "3.8" and python_version < "4.0"
+toml==0.10.2 ; python_version >= "3.8" and python_version < "4.0"
+tomli==2.0.1 ; python_version >= "3.8" and python_full_version < "3.11.0a7"
+typing-extensions==4.6.2 ; python_version >= "3.8" and python_version < "3.10"
+urllib3==2.0.2 ; python_version >= "3.8" and python_version < "4.0"

requirements.txt

@@ -1,11 +1,12 @@
-certifi==2021.10.8; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0"
-charset-normalizer==2.0.12; python_full_version >= "3.6.0" and python_version >= "3"
-falcon-swagger-ui @ git+https://github.com/alanorth/falcon-swagger-ui.git@falcon3-update-swagger-ui
-falcon==3.1.0; python_version >= "3.5"
-gunicorn==20.1.0; python_version >= "3.5"
-idna==3.3; python_version >= "3.5" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.5"
-jinja2==3.0.3; python_version >= "3.6"
-markupsafe==2.0.1; python_version >= "3.6"
-psycopg2==2.9.3; python_version >= "3.6"
-requests==2.27.1; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.6.0")
-urllib3==1.26.9; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version < "4"
+certifi==2023.5.7 ; python_version >= "3.8" and python_version < "4.0"
+charset-normalizer==3.1.0 ; python_version >= "3.8" and python_version < "4.0"
+falcon-swagger-ui @ git+https://github.com/alanorth/falcon-swagger-ui.git@falcon3-update-swagger-ui ; python_version >= "3.8" and python_version < "4.0"
+falcon==3.1.1 ; python_version >= "3.8" and python_version < "4.0"
+gunicorn==20.1.0 ; python_version >= "3.8" and python_version < "4.0"
+idna==3.4 ; python_version >= "3.8" and python_version < "4.0"
+jinja2==3.1.2 ; python_version >= "3.8" and python_version < "4.0"
+markupsafe==2.1.2 ; python_version >= "3.8" and python_version < "4.0"
+psycopg2==2.9.6 ; python_version >= "3.8" and python_version < "4.0"
+requests==2.31.0 ; python_version >= "3.8" and python_version < "4.0"
+setuptools==67.8.0 ; python_version >= "3.8" and python_version < "4.0"
+urllib3==2.0.2 ; python_version >= "3.8" and python_version < "4.0"

setup.cfg

@@ -1,6 +0,0 @@
-[isort]
-multi_line_output=3
-include_trailing_comma=True
-force_grid_wrap=0
-use_parentheses=True
-line_length=88