Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modernise for latest Wagtail and Django #474

Open
wants to merge 27 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
7aca2a9
gets django 32,40 + and wagtail 215,216 working
nickmoreton Nov 11, 2022
7a191c8
Add tox github actions
nickmoreton Nov 11, 2022
acab696
Wagtail 3 changes
nickmoreton Nov 11, 2022
319ec6f
Make missing migrations and fixup testing and include pre-commit
nickmoreton Nov 11, 2022
82a7bd8
Fixup home page panels
nickmoreton Nov 13, 2022
5913dec
Move Longclaw Dashboard
nickmoreton Nov 13, 2022
9217349
Add setup to Makefile
nickmoreton Nov 13, 2022
fd480c5
Correct imports
nickmoreton Nov 13, 2022
9c25fdc
Adjust stats template
nickmoreton Nov 13, 2022
e31cccd
Add some test templates
nickmoreton Nov 13, 2022
2de185a
Remove project_template
nickmoreton Nov 13, 2022
bd71159
Ignore vagrant folder
nickmoreton Nov 13, 2022
804ad56
Use in-memory db for tests
nickmoreton Nov 13, 2022
cf3b9be
Add coverage reporting
nickmoreton Nov 13, 2022
da07f20
Update classifiers
nickmoreton Nov 13, 2022
ca10400
Remove vagrant files again
nickmoreton Nov 13, 2022
53d8223
Add default_auto_field = "django.db.models.AutoField"
nickmoreton Nov 13, 2022
37d1cd4
Fix load countries
nickmoreton Nov 13, 2022
d55b9b0
Alter order model admin.
nickmoreton Nov 13, 2022
b778d26
Alter shipping mode admin
nickmoreton Nov 13, 2022
12d47df
Add loadcountries command to Makefile
nickmoreton Nov 14, 2022
5bd7185
Change verbose names on shipping
nickmoreton Nov 16, 2022
9d6e6ce
Add home page model
nickmoreton Nov 16, 2022
4601d2f
Bring in more templates
nickmoreton Nov 16, 2022
1a98eba
Add temporary docs to README
nickmoreton Nov 17, 2022
6e957b1
Try alternative countries dump data to avoid test fails in CI
nickmoreton Nov 17, 2022
79e6576
Merge pull request #3 from nickmoreton/work-on-testing
nickmoreton Nov 17, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
[run]
branch = true

[report]
omit =
*site-packages*
*tests*
*.tox*
show_missing = True
exclude_lines =
raise NotImplementedError
branch = True
include = longclaw/*
omit = */migrations/*,*/test/*,*/bin/*,*/docs/*,*/tests/*,*/__init__.py
2 changes: 0 additions & 2 deletions .dockerignore

This file was deleted.

23 changes: 0 additions & 23 deletions .editorconfig

This file was deleted.

37 changes: 37 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Tests

on:
push:
branches:
- main
- 'stable/**'

pull_request:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

permissions:
contents: read # to fetch code (actions/checkout)

jobs:

test-python:
runs-on: ubuntu-latest
strategy:
matrix:
python: ["3.8", "3.9", "3.10", "3.11"]

steps:
- uses: actions/checkout@v3
- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install tox tox-gh-actions
- name: Test with tox
run: tox
173 changes: 140 additions & 33 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,56 +1,163 @@
# Created by https://www.toptal.com/developers/gitignore/api/python
# Edit at https://www.toptal.com/developers/gitignore?templates=python

### Python ###
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
__pycache__
.directory
.vscode/
tags
node_modules/
*$py.class

# C extensions
*.so

# Packages
*.egg
*.egg-info
dist
build
eggs
parts
var
sdist
develop-eggs
# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
share/python-wheels/
*.egg-info/
.installed.cfg
lib
lib64
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.tox
.coverage.*
.cache
nosetests.xml
coverage.xml
htmlcov
*.cover
*.py,cover
.hypothesis/
.pytest_cache/
cover/

# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py
*.sqlite3
*.sqlite3-journal

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
.pybuilder/
target/

# Jupyter Notebook
.ipynb_checkpoints

# IPython
profile_default/
ipython_config.py

# Mr Developer
.mr.developer.cfg
.project
.pydevproject
# pyenv
# For a library or package, you might want to ignore these files since the code is
# intended to run in multiple environments; otherwise, check them in:
# .python-version

# Pycharm/Intellij
.idea
# pipenv
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
# However, in case of collaboration, if having platform-specific dependencies or dependencies
# having no cross-platform support, pipenv may install dependencies that don't work, or not
# install all needed dependencies.
#Pipfile.lock

# Complexity
output/*.html
output/*/index.html
# poetry
# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
# This is especially recommended for binary packages to ensure reproducibility, and is more
# commonly ignored for libraries.
# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
#poetry.lock

# Sphinx
docs/_build
# pdm
# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
#pdm.lock
# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
# in version control.
# https://pdm.fming.dev/#use-with-ide
.pdm.toml

# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
__pypackages__/

webpack-stats.json
*bundle.js*
.eggs/
# Celery stuff
celerybeat-schedule
celerybeat.pid

# SageMath parsed files
*.sage.py

# Environments
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site

# mypy
.mypy_cache/
.dmypy.json
dmypy.json

# Pyre type checker
.pyre/

# pytype static type analyzer
.pytype/

# Cython debug symbols
cython_debug/

# local
poetry.lock
node_modules/
/tempkeep
/vagrant
16 changes: 0 additions & 16 deletions .landscape.yaml

This file was deleted.

13 changes: 13 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
repos:
- repo: https://github.com/pycqa/isort
rev: 5.10.1
hooks:
- id: isort
- repo: https://github.com/psf/black
rev: 22.10.0
hooks:
- id: black
- repo: https://github.com/pycqa/flake8
rev: 5.0.4
hooks:
- id: flake8
32 changes: 0 additions & 32 deletions .travis.yml

This file was deleted.

4 changes: 4 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
History
-------

Unreleased

# This work to re-boot the project and modernise codebase

1.0.0
+++++++++++

Expand Down
10 changes: 0 additions & 10 deletions Dockerfile

This file was deleted.

10 changes: 0 additions & 10 deletions Dockerfile.dev

This file was deleted.

Loading