Skip to content

Commit

Permalink
Merge pull request #6 from uktrade/chore/rename
Browse files Browse the repository at this point in the history
Rename the repo and tidy up
  • Loading branch information
wpfl-dbt authored Oct 9, 2024
2 parents 4d4a2e9 + 1a07d6b commit 2944d15
Show file tree
Hide file tree
Showing 91 changed files with 448 additions and 34,788 deletions.
14 changes: 13 additions & 1 deletion .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
name: Unit tests

on:
pull_request:
branches: [ main ]
workflow_dispatch:

jobs:
uv-example:
name: python
Expand All @@ -13,11 +18,18 @@ jobs:

- name: Set up Python
run: uv python install

- name: Install the project
run: uv sync --all-extras --dev

- name: Set up PostgreSQL
run: |
docker compose up db -d --wait
- name: Run pytest
run: |
uv python -m pytest
uv run pytest
- name: Dump docker logs
if: failure()
uses: jwalton/gh-docker-logs@v2
23 changes: 23 additions & 0 deletions .github/workflows/ruff.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Ruff

on:
pull_request:
branches: [ main ]
workflow_dispatch:

jobs:
ruff:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: chartboost/ruff-action@v1
with:
args: format --check

ruff-lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: chartboost/ruff-action@v1
with:
args: check
130 changes: 107 additions & 23 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
######################
# Project .gitignore #
######################


scratch/
*.ipynb_checkpoints

Expand All @@ -9,16 +14,22 @@ scratch/
.tmp/
notebooks/tmp*


##########################
# Boilerplate .gitignore #
##########################


# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
env/
build/
develop-eggs/
dist/
Expand All @@ -30,9 +41,12 @@ lib64/
parts/
sdist/
var/
wheels/
share/python-wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
Expand All @@ -47,54 +61,124 @@ pip-delete-this-directory.txt
# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
*.py,cover
.hypothesis/
.pytest_cache/
cover/

# Translations
*.mo
*.pot

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

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
.pybuilder/
target/

# DotEnv configuration
# Jupyter Notebook
.ipynb_checkpoints

# IPython
profile_default/
ipython_config.py

# 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

# 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

# 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

# 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/latest/usage/project/#working-with-version-control
.pdm.toml
.pdm-python
.pdm-build/

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

# Celery stuff
celerybeat-schedule
celerybeat.pid

# SageMath parsed files
*.sage.py

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

# Database
*.db
*.rdb

# Pycharm
.idea
# Spyder project settings
.spyderproject
.spyproject

# VS Code
.vscode/
# Rope project settings
.ropeproject

# Spyder
.spyproject/
# mkdocs documentation
/site

# Jupyter NB Checkpoints
.ipynb_checkpoints/
# mypy
.mypy_cache/
.dmypy.json
dmypy.json

# Mac OS-specific storage files
.DS_Store
# Pyre type checker
.pyre/

# vim
*.swp
*.swo
# pytype static type analyzer
.pytype/

# Mypy cache
.mypy_cache/
# Cython debug symbols
cython_debug/

# Theia
.theia
# PyCharm
# JetBrains specific template is maintained in a separate JetBrains.gitignore that can
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
# and can be added to the global gitignore or merged into this file. For a more nuclear
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
#.idea/
10 changes: 10 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"python.testing.pytestArgs": [
"test"
],
"python.testing.unittestEnabled": false,
"python.testing.pytestEnabled": true,
"editor.formatOnSave": true,
"editor.defaultFormatter": "charliermarsh.ruff",
"ruff.runOnSave": true
}
101 changes: 0 additions & 101 deletions Makefile

This file was deleted.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ Record matching is a chore. We aim to:

This project is managed by [uv](https://docs.astral.sh/uv/), linted and formated with [ruff](https://docs.astral.sh/ruff/), and tested with [pytest](https://docs.pytest.org/en/stable/).

Task running is done with [make](https://www.gnu.org/software/make/). To see all available commands:
Task running is done with [just](https://just.systems/man/en/). To see all available commands:

```console
make
just -l
```
3 changes: 0 additions & 3 deletions cmf/dedupers/__init__.py

This file was deleted.

Loading

0 comments on commit 2944d15

Please sign in to comment.