Skip to content
This repository was archived by the owner on Aug 11, 2024. It is now read-only.

Commit a2db78f

Browse files
committed
Complete cleanup. Dj4.2/Py3.11
1 parent 3c6e598 commit a2db78f

File tree

23 files changed

+511
-575
lines changed

23 files changed

+511
-575
lines changed

.env

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
DJANGO_SETTINGS_MODULE=memcache_status.tests.testapp.settings
2-
2+
TEST_WITH_DEBUGTOOLBAR=on
3+
#TEST_WITH_DEBUGTOOLBAR=off
4+
TEST_CACHE_BACKEND=django-pylibmc
5+
#TEST_CACHE_BACKEND=django-pymemcache

.github/workflows/push.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Testsuite Run
2+
3+
on: [push]
4+
5+
jobs:
6+
build:
7+
runs-on: ubuntu-latest
8+
strategy:
9+
max-parallel: 4
10+
matrix:
11+
python-version: ["3.8", "3.9", "3.10", "3.11"]
12+
13+
steps:
14+
- uses: actions/checkout@v3
15+
16+
- name: Set up Python ${{ matrix.python-version }}
17+
uses: actions/setup-python@v4
18+
with:
19+
python-version: ${{ matrix.python-version }}
20+
21+
- name: Install dependencies
22+
run: |
23+
python -m pip install --upgrade pip
24+
pip install tox tox-gh-actions
25+
26+
- name: Test with tox
27+
run: tox

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
testdb.sqlite
2-
.static
2+
.static
3+
build
4+
dist
5+
*.egg-info

.python-version

Lines changed: 0 additions & 5 deletions
This file was deleted.

.travis.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.

MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ include *.lock
33
include *.py
44
include LICENSE
55
include Pipfile
6+
include pyproject.toml
67
include tox.ini
78
recursive-include memcache_status *.html
89

Pipfile

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@ url = "https://pypi.org/simple"
44
verify_ssl = true
55

66
[dev-packages]
7-
coverage = "*"
8-
codacy-coverage = "*"
9-
ipdb = "*"
10-
isort = "*"
117
black = "*"
8+
ruff = "*"
129
pytest = "*"
1310
pytest-django = "*"
14-
pytest-cov = "*"
11+
wheel = "*"
12+
setuptools = "*"
13+
ipdb = "*"
1514

1615
[packages]
1716
django-memcache-status = {editable = true,path = "."}
@@ -26,6 +25,6 @@ django-pymemcache = "*"
2625
allow_prereleases = true
2726

2827
[scripts]
29-
test = "sh -c \"coverage erase && pytest && coverage html && echo Coverage report in /tmp/coverage_report/django-memcache-status/index.html\""
30-
cleanup = "sh -c \"isort -rc memcache_status && black --skip-string-normalization --line-length=80 --exclude='/(migrations)/' memcache_status\""
31-
testserver = "sh -c \"django-admin migrate --noinput && django-admin runserver\""
28+
test = "sh -c \"pytest\""
29+
cleanup = "sh -c \"ruff --fix memcache_status && black memcache_status\""
30+
runserver = "sh -c \"django-admin migrate --noinput && django-admin runserver\""

Pipfile.lock

Lines changed: 220 additions & 271 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.rst

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,6 @@
11
.. image:: https://img.shields.io/pypi/v/django-memcache-status.svg
22
:target: https://pypi.org/project/django-memcache-status/
33

4-
.. image:: https://travis-ci.org/bartTC/django-memcache-status.svg?branch=master
5-
:target: https://travis-ci.org/bartTC/django-memcache-status
6-
7-
.. image:: https://api.codacy.com/project/badge/Coverage/1d7d0306c4d14fb9817017d7d23237fe
8-
:target: https://www.codacy.com/app/bartTC/django-memcache-status
9-
10-
.. image:: https://api.codacy.com/project/badge/Grade/1d7d0306c4d14fb9817017d7d23237fe
11-
:target: https://www.codacy.com/app/bartTC/django-memcache-status
12-
134
-----
145

156
======================
@@ -24,17 +15,26 @@ Currently these memcached bindings are tested:
2415
========================================================= ================================
2516
Backend Support
2617
========================================================= ================================
27-
`python-memcached`_ with vanilla Django ✅ Works fine with >= v1.57
28-
pylibmc with `django-pylibmc`_ ✅ Works fine
29-
pymemcache with `django-pymemcache`_ ❎ Does not provide stats
18+
``django.core.cache.backends.memcached.PyLibMCCache`` ✅ Works fine
19+
``django.core.cache.backends.memcached.PyMemcacheCache`` ❎ Does not provide stats
3020
========================================================= ================================
3121

3222
Other bindings may provide statistics too.
3323

3424
.. _memcached: http://www.danga.com/memcached/
35-
.. _python-memcached: https://pypi.org/project/python-memcached/
36-
.. _django-pylibmc: https://pypi.org/project/django-pylibmc/
37-
.. _django-pymemcache: https://pypi.org/project/django-pymemcache/
25+
26+
Compatibility Matrix:
27+
=====================
28+
29+
========= === === ==== ====
30+
Py/Dj 3.8 3.9 3.10 3.11
31+
========= === === ==== ====
32+
3.2 (LTS) ✓ ✓ ✓ ✓
33+
4.0 ✓ ✓ ✓ ✓
34+
4.1 ✓ ✓ ✓ ✓
35+
4.2 (LTS) ✓ ✓ ✓ ✓
36+
========= === === ==== ====
37+
3838

3939
Installation
4040
============
@@ -107,10 +107,15 @@ To test a specific cache backend define it in the env variable::
107107
Changelog
108108
=========
109109

110+
**v2.3 (2023-04-29):**
111+
112+
- Compatibility and tests for Django 3.2 to 4.2, and Python 3.11.
113+
- Dropped support for Django 2.2.
114+
110115
**v2.2 (2020-02-05):**
111116

112117
- Compatibility and tests for Django 2.2 and 3.0, and Python 3.8.
113-
- Use pytest for testing.
118+
- Use pytest for testing.
114119

115120
**v2.1 (2019-03-21):**
116121

memcache_status/__init__.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +0,0 @@
1-
from __future__ import unicode_literals
2-
3-
default_app_config = 'memcache_status.apps.MemcacheStatusConfig'

0 commit comments

Comments
 (0)