Merge remote-tracking branch 'github/master' into support_202307

.github/workflows/tests.yml

@@ -3,39 +3,15 @@ name: tests
 on: [push, pull_request]
 
 jobs:
-
   linting:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
-        with:
-          python-version: 3.9
-      - name: Install Poetry
-        uses: snok/install-poetry@v1
-        with:
-          virtualenvs-create: true
-          virtualenvs-in-project: true
-          installer-parallel: true
-      - name: Load cached venv
-        id: cached-poetry-dependencies
-        uses: actions/cache@v2
-        with:
-          path: .venv
-          key: venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}
-      - name: Ensure cache is healthy
-        if: steps.cache.outputs.cache-hit == 'true'
-        shell: bash
-        run: timeout 10s poetry run pip --version || rm -rf .venv
-      # install dependencies if cache does not exist
-      - name: Check cache and install dependencies
-        run: poetry install --no-interaction --no-root
+      - name: Install virtualenv from poetry
+        uses: 20c/workflows/poetry@v1
       - name: Run linters
         run: |
-          poetry run isort .
-          poetry run black . --check
-          # poetry run flake8 peeringdb_server
-
+          poetry run pre-commit run --all-files
   test:
     needs: linting
     runs-on: ubuntu-latest

.pre-commit-config.yaml

@@ -5,7 +5,7 @@ exclude: |
     )$
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.3.0
+    rev: v4.4.0
     hooks:
       - id: check-yaml
       - id: end-of-file-fixer
@@ -32,10 +32,10 @@ repos:
         entry: poetry run black .
         language: system
         pass_filenames: false
-  - repo: local
-    hooks:
-      - id: system
-        name: flake8
-        entry: poetry run flake8 peeringdb_server
-        language: system
-        pass_filenames: false
+#  - repo: local
+#    hooks:
+#      - id: system
+#        name: flake8
+#        entry: poetry run flake8 peeringdb_server
+#        language: system
+#        pass_filenames: false

Ctl/dev/docker-compose.yml

@@ -58,7 +58,7 @@ services:
       #
       # expects a https://github.com/peeringdb/django-peeringdb source checkout in the parent
       # directory
-      # - ../../../django-peeringdb/src/django_peeringdb:/srv/www.peeringdb.com/venv/lib/python3.9/site-packages/django_peeringdb:Z
+      - ../../../django-peeringdb/src/django_peeringdb:/srv/www.peeringdb.com/venv/lib/python3.9/site-packages/django_peeringdb:Z
 
     networks:
       - peeringdb_network

Dockerfile

@@ -25,7 +25,7 @@ ARG run_deps=" \
     libgcc \
     "
 
-FROM python:3.9-alpine as base
+FROM python:3.11-alpine as base
 
 ARG virtual_env=/srv/www.peeringdb.com/venv
 

README.md

@@ -1,8 +1,9 @@
 
 # PeeringDB
 
-[![Travis CI](https://img.shields.io/travis/peeringdb/peeringdb.svg?maxAge=3600)](https://travis-ci.org/peeringdb/peeringdb)
-[![Codecov](https://img.shields.io/codecov/c/github/peeringdb/peeringdb/master.svg?maxAge=3600)](https://codecov.io/github/peeringdb/peeringdb)
+[![tests](https://github.com/peeringdb/peeringdb/actions/workflows/tests.yml/badge.svg)](https://github.com/peeringdb/peeringdb/actions/workflows/tests.yml)
+[![CodeQL](https://github.com/peeringdb/peeringdb/actions/workflows/codeql.yml/badge.svg)](https://github.com/peeringdb/peeringdb/actions/workflows/codeql.yml)
+[![codecov](https://codecov.io/gh/peeringdb/peeringdb/branch/master/graph/badge.svg?token=zYAhZzltxV)](https://codecov.io/gh/peeringdb/peeringdb)
 
 
 [PeeringDB](https://www.peeringdb.com/) provides a scalable way to publish

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "peeringdb_server"
-version = "2.49.0-beta"
+version = "2.49.0"
 description = "source code for PeeringDB.com"
 readme = "README.md"
 repository = "https://github.com/peeringdb/peeringdb"