Skip to content

Commit a5a8aaf

Browse files
shtalinbergshtalinberg
authored
Merge pull request #165 from shtalinberg/develop
bump 4.0.0
2 parents 0d35f95 + cd1dc85 commit a5a8aaf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+464
-371
lines changed

‎.github/workflows/tox.yml

+86
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
name: Tox
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
tox-lint:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: actions/checkout@v3
10+
- uses: actions/setup-python@v4
11+
with:
12+
python-version: "3.8"
13+
- run: pip install --upgrade pip
14+
- run: pip install tox
15+
- run: tox -e lint # Perhaps use ${{ job.name }}
16+
17+
tox-docs:
18+
runs-on: ubuntu-latest
19+
steps:
20+
- uses: actions/checkout@v3
21+
- uses: actions/setup-python@v4
22+
with:
23+
python-version: "3.8"
24+
- run: pip install --upgrade pip
25+
- run: pip install tox
26+
- run: tox -e docs || true # Fix error and remove "|| true"!
27+
28+
tox-docs-linkcheck:
29+
runs-on: ubuntu-latest
30+
steps:
31+
- uses: actions/checkout@v3
32+
- uses: actions/setup-python@v4
33+
with:
34+
python-version: "3.8"
35+
- run: pip install --upgrade pip
36+
- run: pip install tox
37+
- run: tox -e docs-linkcheck || true # Fix error and remove "|| true"!
38+
39+
build:
40+
strategy:
41+
fail-fast: false
42+
max-parallel: 5
43+
matrix:
44+
os: [ubuntu-latest] # [macos-latest, ubuntu-latest, windows-latest]
45+
python-version: ['3.8', '3.9', '3.10']
46+
django-version: ["==3.2.*", "==4.0.*", "==4.1.*"]
47+
# exclude:
48+
# # Django 4.0 no longer supports python 3.7
49+
# - python-version: 3.7
50+
# django-version: "==4.0.*"
51+
52+
runs-on: ${{ matrix.os }}
53+
54+
steps:
55+
- uses: actions/checkout@v3
56+
- uses: actions/setup-python@v4
57+
with:
58+
python-version: ${{ matrix.python }}
59+
60+
- name: Get pip cache dir
61+
id: pip-cache
62+
run: |
63+
echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT
64+
65+
- name: Cache
66+
uses: actions/cache@v3
67+
with:
68+
path: ${{ steps.pip-cache.outputs.dir }}
69+
key:
70+
-${{ matrix.python-version }}-v1-${{ hashFiles('**/setup.py') }}
71+
restore-keys: |
72+
-${{ matrix.python-version }}-v1-
73+
74+
- name: Install dependencies
75+
run: |
76+
python -m pip install --upgrade pip
77+
python -m pip install --upgrade tox tox-gh-actions
78+
79+
- name: Tox tests
80+
run: |
81+
tox -v
82+
83+
- name: Upload coverage
84+
uses: codecov/codecov-action@v3
85+
with:
86+
name: Python ${{ matrix.python-version }}

‎.gitignore

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ doc/_build
66
/help-man
77
dist/
88
~$
9-
.venv*
9+
.venv/
1010
.coverage
1111
.ropeproject
1212
.DS_Store
1313
MANIFEST
1414
tests/settings_local.py
1515
*.log
16-
.tox/
16+
.tox/
17+
*.egg-info/

‎.hgignore

-10
This file was deleted.

‎.travis.yml

-43
This file was deleted.

‎.vscode/settings.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"python.formatting.provider": "black"
3+
}

‎HACKING

+2-6
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,15 @@ Here are the steps needed to set up a development and testing environment.
66
Creating a development environment
77
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
88

9-
The development environment is created in a virtualenv. The environment
10-
creation requires the *make* and *virtualenv* programs to be installed.
9+
The development environment is created in a venv. The environment
10+
creation requires the *make* program to be installed.
1111

1212
To install *make* under Debian/Ubuntu::
1313

1414
$ sudo apt-get install build-essential
1515

1616
Under Mac OS/X, *make* is available as part of XCode.
1717

18-
To install virtualenv::
19-
20-
$ sudo pip install virtualenv
21-
2218
At this point, from the root of this branch, run the command::
2319

2420
$ make

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Copyright (c) 2009-2013 Francesco Banconi
2-
Copyright (c) 2015-2017 Oleksandr Shtalinberg
2+
Copyright (c) 2015-2023 Oleksandr Shtalinberg
33

44
Permission is hereby granted, free of charge, to any person obtaining a copy of
55
this software and associated documentation files (the "Software"), to deal in

‎Makefile

+5-7
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,15 @@
22

33
# Define these variables based on the system Python versions.
44
PYTHON3 = python3
5-
VENV3 = .venv3
65

7-
LINTER = flake8 --show-source endless_pagination/ tests/
6+
LINTER = flake8 --show-source el_pagination/ tests/
87
MANAGE = python ./tests/manage.py
98

109
PYTHON = $(PYTHON3)
11-
VENV = $(VENV3)
1210

1311
DOC_INDEX = doc/_build/html/index.html
14-
VENV_ACTIVATE = $(VENV)/bin/activate
15-
WITH_VENV = ./tests/with_venv.sh $(VENV)
12+
VENV_ACTIVATE = .venv/bin/activate
13+
WITH_VENV = ./tests/with_venv.sh .venv
1614

1715
all: develop
1816

@@ -28,7 +26,7 @@ clean:
2826
find . -name '__pycache__' -type d -delete
2927

3028
cleanall: clean
31-
rm -rfv $(VENV2) $(VENV3)
29+
rm -rfv .venv
3230

3331
check: test lint
3432

@@ -51,7 +49,7 @@ help:
5149
@echo 'make shell - Enter Django interactive interpreter'
5250
@echo 'make server - Run Django development server'
5351
@echo 'make clean - Get rid of bytecode files, build dirs, dist files'
54-
@echo 'make cleanall - Clean and also get rid of the virtualenvs'
52+
@echo 'make cleanall - Clean and also get rid of the venvs'
5553
@echo -e '\nDefine the env var PY3 to work using Python 3.'
5654
@echo 'E.g. to create a Python 3 development environment:'
5755
@echo ' - make PY3=1'

‎PKG-INFO

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Metadata-Version: 1.2
22
Name: django-el-pagination
3-
Version: 3.3.0
3+
Version: 4.0.0
44
Summary: Django pagination tools supporting Ajax, multiple and lazy pagination, Twitter-style and Digg-style pagination.
55
Home-page: https://github.com/shtalinberg/django-el-pagination
66
Author: Oleksandr Shtalinberg

‎README.rst

+8-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Django EL(Endless) Pagination
33
=============================
44

55
| |pypi-pkg-version| |python-versions| |django-versions| |pypi-status| |docs|
6-
| |travis-ci-status| |codecov|
6+
| |build-ci-status| |codecov|
77
88
Django EL(Endless) Pagination can be used to provide Twitter-style or
99
Digg-style pagination, with optional Ajax support and other features
@@ -12,8 +12,10 @@ like multiple or lazy pagination.
1212
This app **django-el-pagination** forked from django-endless-pagination==2.0 (https://github.com/frankban/django-endless-pagination)
1313

1414
From version 3.0.0 drop support Django<1.8. For support Django<1.8 use django-endless-pagination==2.x.x
15+
1516
From version 3.3.0 drop support Django<1.11. For support Django<1.11 use django-endless-pagination<3.3.x
1617

18+
From version 4.0.0 drop support Django<3.2. For support Django<3.2 use django-endless-pagination<4.0.x
1719

1820
The initial idea, which has guided the development of this application,
1921
is to allow pagination of web contents in `very few steps
@@ -33,15 +35,15 @@ Pull requests are welcome. See `Contributing Guide
3335
<http://django-el-pagination.readthedocs.io/en/latest/contributing.html>`_.
3436

3537

36-
.. |travis-ci-status| image:: https://travis-ci.org/shtalinberg/django-el-pagination.svg?branch=develop
37-
:target: https://travis-ci.org/shtalinberg/django-el-pagination
38+
.. |build-ci-status| image:: https://github.com/jazzband/shtalinberg/django-el-pagination/Test/badge.svg
39+
:target: https://github.com/shtalinberg/django-el-pagination/actions
3840
.. |docs| image:: https://readthedocs.org/projects/django-el-pagination/badge/?version=latest&style=flat
3941
:target: https://django-el-pagination.readthedocs.io/
4042
.. |pypi-pkg-version| image:: https://img.shields.io/pypi/v/django-el-pagination.svg
4143
:target: https://pypi.python.org/pypi/django-el-pagination/
4244
.. |pypi-status| image:: https://img.shields.io/pypi/status/coverage.svg
4345
:target: https://pypi.python.org/pypi/django-el-pagination/
4446
.. |python-versions| image:: https://img.shields.io/pypi/pyversions/django-el-pagination.svg
45-
.. |django-versions| image:: https://img.shields.io/badge/django-1.8%20or%20newer-green.svg
46-
.. |codecov| image:: https://codecov.io/gh/shtalinberg/django-el-pagination/branch/develop/graph/badge.svg
47-
:target: https://codecov.io/gh/shtalinberg/django-el-pagination
47+
.. |django-versions| image:: https://img.shields.io/pypi/djversions/django-el-pagination.svg
48+
.. |codecov| image:: https://codecov.io/gh/shtalinberg/django-el-pagination/branch/master/graph/badge.svg
49+
:target: https://codecov.io/gh/shtalinberg/django-el-pagination

‎doc/changelog.rst

+13-1
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,21 @@ Changelog
22
=========
33

44

5+
Version 4.0.0
6+
~~~~~~~~~~~~~
7+
8+
**New feature**: Django 4.1.x support.
9+
Django EL(Endless) Pagination now supports Django from 3.2.x to 4.1.x
10+
supports Python 3.8, 3.9, 3.10
11+
12+
513
Version 3.3.0
614
~~~~~~~~~~~~~
715

816
**New feature**: Django 3.0.x support.
917
Django EL(Endless) Pagination now supports Django from 1.11.x to 3.0.x
10-
Dropped support for Python 2.x
18+
Dropped support for Python 2.x
19+
1120

1221
Version 3.2.4
1322
~~~~~~~~~~~~~
@@ -22,12 +31,14 @@ Bug-fix release
2231
**Fix**: cycle in show_pages with django 2.0
2332
fix tests for PageList.get_rendered()
2433

34+
2535
Version 3.2.2
2636
~~~~~~~~~~~~~
2737
Bug-fix release
2838

2939
**Fix**: fix UnicodeEncodeError with translate in templates
3040

41+
3142
Version 3.2.0
3243
~~~~~~~~~~~~~
3344
**New feature**: Django 2.0.x support.
@@ -57,6 +68,7 @@ Version 3.2.0
5768
utils.UnicodeMixin
5869
utils.text
5970

71+
6072
Version 3.1.0
6173
~~~~~~~~~~~~~
6274
**Template changes**:

‎doc/conf.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
"""Django EL(Endless) Pagination documentation build configuration file."""
22

3-
from __future__ import unicode_literals
3+
44

55
AUTHOR = 'Oleksandr Shtalinberg and Francesco Banconi'
66
APP = 'Django EL(Endless) Pagination'
77
TITLE = APP + ' Documentation'
8-
VERSION = '3.2.4'
8+
VERSION = '4.0.0'
99

1010

1111
# Add any Sphinx extension module names here, as strings. They can be
@@ -23,7 +23,7 @@
2323

2424
# General information about the project.
2525
project = APP
26-
copyright = '2009-2018, ' + AUTHOR
26+
copyright = '2009-2023, ' + AUTHOR
2727

2828
# The short X.Y version.
2929
version = release = VERSION

‎doc/contributing.rst

+3-7
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,15 @@ Please, change code and submit all pull requests into branch `develop`
1313
Creating a development environment
1414
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1515

16-
The development environment is created in a virtualenv. The environment
17-
creation requires the *make* and *virtualenv* programs to be installed.
16+
The development environment is created in a venv. The environment
17+
creation requires the *make* program to be installed.
1818

1919
To install *make* under Debian/Ubuntu::
2020

2121
$ sudo apt-get install build-essential
2222

2323
Under Mac OS/X, *make* is available as part of XCode.
2424

25-
To install virtualenv::
26-
27-
$ sudo pip install virtualenv
28-
2925
At this point, from the root of this branch, run the command::
3026

3127
$ make
@@ -56,7 +52,7 @@ tests, define the environment variable SKIP_SELENIUM, e.g.::
5652
$ make test SKIP_SELENIUM=1
5753

5854
Integration tests are excluded by default when using Python 3. The test suite
59-
requires Python >= 2.6.1.
55+
requires Python >= 3.8.x.
6056

6157
Run the tests and lint/pep8 checks::
6258

‎doc/generic_views.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ If the developer wants pagination of publishers, in *views.py* we have code clas
9393
template_name = "myapp/publisher_list.html"
9494
context_object_name = "publisher_list"
9595

96-
or fuction-based::
96+
or function-based::
9797

9898
def entry_index(request, template='myapp/publisher_list.html'):
9999
context = {

0 commit comments

Comments
 (0)