Skip to content

Commit

Permalink
Update skel and test deps.
Browse files Browse the repository at this point in the history
  • Loading branch information
ionelmc committed Apr 11, 2021
1 parent 6ffd14e commit 8472dab
Show file tree
Hide file tree
Showing 21 changed files with 379 additions and 149 deletions.
7 changes: 3 additions & 4 deletions .bumpversion.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,13 @@ search = version='{current_version}'
replace = version='{new_version}'

[bumpversion:file:README.rst]
search = v{current_version}.
replace = v{new_version}.
search = /v{current_version}.svg
replace = /v{new_version}.svg

[bumpversion:file:docs/conf.py]
search = version = release = '{current_version}'
replace = version = release = '{new_version}'

[bumpversion:file:src/prefetch.py]
[bumpversion:file:src/prefetch/__init__.py]
search = __version__ = '{current_version}'
replace = __version__ = '{new_version}'

27 changes: 21 additions & 6 deletions .cookiecutterrc
Original file line number Diff line number Diff line change
@@ -1,38 +1,53 @@
# Generated by cookiepatcher, a small shim around cookiecutter (pip install cookiepatcher)

cookiecutter:
_template: gh:ionelmc/cookiecutter-pylibrary
default_context:
allow_tests_inside_package: no
appveyor: no
c_extension_function: '-'
c_extension_module: '-'
c_extension_optional: no
c_extension_support: no
c_extension_test_pypi: no
c_extension_test_pypi_username: '-'
codacy: yes
codacy_projectid: 11d1f80103ca434db15e2804b61c522f
codeclimate: yes
codecov: yes
command_line_interface: no
command_line_interface_bin_name: '-'
coveralls: yes
coveralls_token: '[Required for Appveyor, take it from https://coveralls.io/github/ionelmc/django-prefetch]'
distribution_name: django-prefetch
email: contact@ionelmc.ro
full_name: Ionel Cristian Mărieș
github_username: ionelmc
landscape: no
legacy_python: yes
license: BSD 2-Clause License
linter: flake8
package_name: prefetch
pre_commit: yes
project_name: django-prefetch
project_short_description: Simple and generic model related data prefetch framework for Django solving the "1+N queries" problem that happens when you need related data for your objects.
pypi_badge: yes
pypi_disable_upload: no
release_date: today
repo_hosting: github.com
repo_hosting_domain: github.com
repo_name: django-prefetch
repo_username: ionelmc
requiresio: yes
scrutinizer: yes
setup_py_uses_setuptools_scm: no
setup_py_uses_test_runner: no
sphinx_docs: yes
sphinx_docs_hosting: https://django-prefetch.readthedocs.io/
sphinx_doctest: no
sphinx_theme: sphinx-py3doc-enhanced-theme
test_matrix_configurator: no
test_matrix_separate_coverage: no
test_runner: pytest
travis: yes
version: 1.1.0
travis_osx: no
version: 1.2.1
website: http://blog.ionelmc.ro
year: 2012-2017
year_from: '2012'
year_to: '2021'
11 changes: 9 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
# see http://editorconfig.org
# see https://editorconfig.org/
root = true

[*]
# Use Unix-style newlines for most files (except Windows files, see below).
end_of_line = lf
trim_trailing_whitespace = true
insert_final_newline = true
indent_style = space
insert_final_newline = true
indent_size = 4
charset = utf-8

[*.{bat,cmd,ps1}]
end_of_line = crlf

[*.{yml,yaml}]
indent_size = 2

[*.tsv]
indent_style = tab
11 changes: 10 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
*.py[cod]
__pycache__

# C extensions
*.so
Expand All @@ -21,6 +22,7 @@ lib
lib64
venv*/
pyvenv*/
pip-wheel-metadata/

# Installer logs
pip-log.txt
Expand All @@ -37,11 +39,14 @@ htmlcov
# Translations
*.mo

# Mr Developer
# Buildout
.mr.developer.cfg

# IDE project files
.project
.pydevproject
.idea
.vscode
*.iml
*.komodoproject

Expand All @@ -60,6 +65,10 @@ docs/_build
.env
.cache
.pytest
.benchmarks
.bootstrap
.appveyor.token
*.bak

# Mypy Cache
.mypy_cache/
20 changes: 20 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# To install the git pre-commit hook run:
# pre-commit install
# To update the pre-commit hooks run:
# pre-commit install-hooks
exclude: '^(\.tox|ci/templates|\.bumpversion\.cfg)(/|$)'
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: master
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: debug-statements
- repo: https://github.com/timothycrosley/isort
rev: master
hooks:
- id: isort
- repo: https://gitlab.com/pycqa/flake8
rev: master
hooks:
- id: flake8
10 changes: 10 additions & 0 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
version: 2
sphinx:
configuration: docs/conf.py
formats: all
python:
install:
- requirements: docs/requirements.txt
- method: pip
path: .
165 changes: 135 additions & 30 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,71 +19,176 @@ matrix:
- python: '2.7'
env:
- TOXENV=py27-dj111,report,coveralls,codecov
- python: '3.4'
- python: '3.6'
env:
- TOXENV=py36-dj19,report,coveralls,codecov
- python: '3.6'
env:
- TOXENV=py36-dj110,report,coveralls,codecov
- python: '3.6'
env:
- TOXENV=py36-dj111,report,coveralls,codecov
- python: '3.7'
dist: xenial
sudo: required
env:
- TOXENV=py37-dj19,report,coveralls,codecov
- python: '3.7'
dist: xenial
sudo: required
env:
- TOXENV=py37-dj110,report,coveralls,codecov
- python: '3.7'
dist: xenial
sudo: required
env:
- TOXENV=py37-dj111,report,coveralls,codecov
- python: '3.8'
env:
- TOXENV=py34-dj19,report,coveralls,codecov
- python: '3.4'
- TOXENV=py38-dj19,report,coveralls,codecov
- python: '3.8'
env:
- TOXENV=py34-dj110,report,coveralls,codecov
- python: '3.4'
- TOXENV=py38-dj110,report,coveralls,codecov
- python: '3.8'
env:
- TOXENV=py34-dj111,report,coveralls,codecov
- python: '3.4'
- TOXENV=py38-dj111,report,coveralls,codecov
- python: '3.9'
env:
- TOXENV=py34-dj20,report,coveralls,codecov
- python: '3.5'
- TOXENV=py39-dj19,report,coveralls,codecov
- python: '3.9'
env:
- TOXENV=py35-dj19,report,coveralls,codecov
- python: '3.5'
- TOXENV=py39-dj110,report,coveralls,codecov
- python: '3.9'
env:
- TOXENV=py35-dj110,report,coveralls,codecov
- python: '3.5'
- TOXENV=py39-dj111,report,coveralls,codecov
- python: 'pypy-5.4'
env:
- TOXENV=py35-dj111,report,coveralls,codecov
- python: '3.5'
- TOXENV=pypy-dj19,report,coveralls,codecov
- python: 'pypy-5.4'
env:
- TOXENV=pypy-dj110,report,coveralls,codecov
- python: 'pypy-5.4'
env:
- TOXENV=py35-dj20,report,coveralls,codecov
- TOXENV=pypy-dj111,report,coveralls,codecov
- python: '3.6'
env:
- TOXENV=py36-dj19,report,coveralls,codecov
- TOXENV=py36-dj111,report,coveralls,codecov
- python: '3.6'
env:
- TOXENV=py36-dj110,report,coveralls,codecov
- TOXENV=py36-dj20,report,coveralls,codecov
- python: '3.6'
env:
- TOXENV=py36-dj111,report,coveralls,codecov
- TOXENV=py36-dj21,report,coveralls,codecov
- python: '3.6'
env:
- TOXENV=py36-dj22,report,coveralls,codecov
- python: '3.6'
env:
- TOXENV=py36-dj30,report,coveralls,codecov
- python: '3.6'
env:
- TOXENV=py36-dj31,report,coveralls,codecov
- python: '3.6'
env:
- TOXENV=py36-dj20,report,coveralls,codecov
- TOXENV=py36-dj32,report,coveralls,codecov
- python: '3.7'
dist: xenial
sudo: required
env:
- TOXENV=py37-dj19,report,coveralls,codecov
- TOXENV=py37-dj111,report,coveralls,codecov
- python: '3.7'
dist: xenial
sudo: required
env:
- TOXENV=py37-dj110,report,coveralls,codecov
- TOXENV=py37-dj20,report,coveralls,codecov
- python: '3.7'
dist: xenial
sudo: required
env:
- TOXENV=py37-dj111,report,coveralls,codecov
- TOXENV=py37-dj21,report,coveralls,codecov
- python: '3.7'
dist: xenial
sudo: required
env:
- TOXENV=py37-dj20,report,coveralls,codecov
- python: 'pypy2'
- TOXENV=py37-dj22,report,coveralls,codecov
- python: '3.7'
dist: xenial
sudo: required
env:
- TOXENV=pypy-dj19,report,coveralls,codecov
- python: 'pypy2'
- TOXENV=py37-dj30,report,coveralls,codecov
- python: '3.7'
dist: xenial
sudo: required
env:
- TOXENV=pypy-dj110,report,coveralls,codecov
- python: 'pypy2'
- TOXENV=py37-dj31,report,coveralls,codecov
- python: '3.7'
dist: xenial
sudo: required
env:
- TOXENV=pypy-dj111,report,coveralls,codecov
- TOXENV=py37-dj32,report,coveralls,codecov
- python: '3.8'
env:
- TOXENV=py38-dj111,report,coveralls,codecov
- python: '3.8'
env:
- TOXENV=py38-dj20,report,coveralls,codecov
- python: '3.8'
env:
- TOXENV=py38-dj21,report,coveralls,codecov
- python: '3.8'
env:
- TOXENV=py38-dj22,report,coveralls,codecov
- python: '3.8'
env:
- TOXENV=py38-dj30,report,coveralls,codecov
- python: '3.8'
env:
- TOXENV=py38-dj31,report,coveralls,codecov
- python: '3.8'
env:
- TOXENV=py38-dj32,report,coveralls,codecov
- python: '3.9'
env:
- TOXENV=py39-dj111,report,coveralls,codecov
- python: '3.9'
env:
- TOXENV=py39-dj20,report,coveralls,codecov
- python: '3.9'
env:
- TOXENV=py39-dj21,report,coveralls,codecov
- python: '3.9'
env:
- TOXENV=py39-dj22,report,coveralls,codecov
- python: '3.9'
env:
- TOXENV=py39-dj30,report,coveralls,codecov
- python: '3.9'
env:
- TOXENV=py39-dj31,report,coveralls,codecov
- python: '3.9'
env:
- TOXENV=py39-dj32,report,coveralls,codecov
- python: 'pypy3-5.4'
env:
- TOXENV=pypy3-dj111,report,coveralls,codecov
- python: 'pypy3-5.4'
env:
- TOXENV=pypy3-dj20,report,coveralls,codecov
- python: 'pypy3-5.4'
env:
- TOXENV=pypy3-dj21,report,coveralls,codecov
- python: 'pypy3-5.4'
env:
- TOXENV=pypy3-dj22,report,coveralls,codecov
- python: 'pypy3-5.4'
env:
- TOXENV=pypy3-dj30,report,coveralls,codecov
- python: 'pypy3-5.4'
env:
- TOXENV=pypy3-dj31,report,coveralls,codecov
- python: 'pypy3-5.4'
env:
- TOXENV=pypy3-dj32,report,coveralls,codecov
before_install:
- python --version
- uname -a
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Changelog
=========

1.2.2 (2021-02-14)
1.2.2 (2021-04-11)
------------------

* Added support for Django 2.0
Expand Down

0 comments on commit 8472dab

Please sign in to comment.