Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ONSdigital/statistical-methods-library
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9.0.0-rc1
Choose a base ref
...
head repository: ONSdigital/statistical-methods-library
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref

Commits on Nov 22, 2022

  1. Bump pytest from 7.1.3 to 7.2.0

    Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.1.3 to 7.2.0.
    - [Release notes](https://github.com/pytest-dev/pytest/releases)
    - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
    - [Commits](pytest-dev/pytest@7.1.3...7.2.0)
    
    ---
    updated-dependencies:
    - dependency-name: pytest
      dependency-type: direct:development
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Nov 22, 2022
    Copy the full SHA
    55d7cf1 View commit details

Commits on Nov 29, 2022

  1. More updates

    arthompson committed Nov 29, 2022
    Copy the full SHA
    7039d07 View commit details
  2. Create CHANGELOG.md

    Piwington authored Nov 29, 2022
    Copy the full SHA
    60a4132 View commit details
  3. Forgot an element

    Piwington authored Nov 29, 2022
    Copy the full SHA
    b446c2a View commit details
  4. Update CHANGELOG.md

    Piwington authored Nov 29, 2022
    Copy the full SHA
    23c1572 View commit details
  5. Update CHANGELOG.md

    Piwington authored Nov 29, 2022
    Copy the full SHA
    4d1e44b View commit details
  6. Copy the full SHA
    a253ea2 View commit details
  7. Update 9.0.0.md

    Piwington authored Nov 29, 2022
    Copy the full SHA
    f4e2f17 View commit details
  8. More explanation

    arthompson committed Nov 29, 2022
    Copy the full SHA
    2d17154 View commit details
  9. Merge pull request #121 from ONSdigital/add-changelog

    Add release notes
    arthompson authored Nov 29, 2022
    Copy the full SHA
    94c54dc View commit details

Commits on Dec 6, 2022

  1. Copy the full SHA
    0d6ec79 View commit details
  2. Round

    Piwington committed Dec 6, 2022
    Copy the full SHA
    2cea232 View commit details
  3. Add release notes

    arthompson committed Dec 6, 2022
    Copy the full SHA
    bbaf411 View commit details
  4. pyproject.toml update

    arthompson committed Dec 6, 2022
    Copy the full SHA
    720f24a View commit details
  5. Copy the full SHA
    1a65492 View commit details
  6. Merge pull request #122 from ONSdigital/precision-fixes

    Precision fixes
    Piwington authored Dec 6, 2022
    Copy the full SHA
    9a005e6 View commit details

Commits on Dec 9, 2022

  1. Bump black from 22.10.0 to 22.12.0

    Bumps [black](https://github.com/psf/black) from 22.10.0 to 22.12.0.
    - [Release notes](https://github.com/psf/black/releases)
    - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md)
    - [Commits](psf/black@22.10.0...22.12.0)
    
    ---
    updated-dependencies:
    - dependency-name: black
      dependency-type: direct:development
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Dec 9, 2022
    Copy the full SHA
    2e3c4c4 View commit details

Commits on Dec 21, 2022

  1. Bump isort from 5.10.1 to 5.11.4

    Bumps [isort](https://github.com/pycqa/isort) from 5.10.1 to 5.11.4.
    - [Release notes](https://github.com/pycqa/isort/releases)
    - [Changelog](https://github.com/PyCQA/isort/blob/main/CHANGELOG.md)
    - [Commits](PyCQA/isort@5.10.1...5.11.4)
    
    ---
    updated-dependencies:
    - dependency-name: isort
      dependency-type: direct:development
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Dec 21, 2022
    Copy the full SHA
    7fc8620 View commit details

Commits on Jan 4, 2023

  1. Bump coverage from 6.5.0 to 7.0.3

    Bumps [coverage](https://github.com/nedbat/coveragepy) from 6.5.0 to 7.0.3.
    - [Release notes](https://github.com/nedbat/coveragepy/releases)
    - [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst)
    - [Commits](nedbat/coveragepy@6.5.0...7.0.3)
    
    ---
    updated-dependencies:
    - dependency-name: coverage
      dependency-type: direct:development
      update-type: version-update:semver-major
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Jan 4, 2023
    Copy the full SHA
    b077a3a View commit details

Commits on Jan 5, 2023

  1. Merge pull request #118 from ONSdigital/dependabot/pip/pytest-7.2.0

    Bump pytest from 7.1.3 to 7.2.0
    arthompson authored Jan 5, 2023
    Copy the full SHA
    425f31e View commit details
  2. Fix conflicts

    arthompson committed Jan 5, 2023
    Copy the full SHA
    7f68369 View commit details
  3. Merge pull request #123 from ONSdigital/dependabot/pip/black-22.12.0

    Bump black from 22.10.0 to 22.12.0
    arthompson authored Jan 5, 2023
    Copy the full SHA
    7cf9749 View commit details
  4. Copy the full SHA
    a6c556e View commit details
  5. Merge pull request #128 from ONSdigital/dependabot/pip/isort-5.11.4

    Bump isort from 5.10.1 to 5.11.4
    arthompson authored Jan 5, 2023
    Copy the full SHA
    365a74a View commit details
  6. Copy the full SHA
    a121f01 View commit details
  7. Merge pull request #131 from ONSdigital/dependabot/pip/coverage-7.0.3

    Bump coverage from 6.5.0 to 7.0.3
    arthompson authored Jan 5, 2023
    Copy the full SHA
    2644c8d View commit details
  8. Merge pull request #132 from ONSdigital/dependabot-updates

    dependabot updates
    arthompson authored Jan 5, 2023
    Copy the full SHA
    7792410 View commit details

Commits on Jan 9, 2023

  1. Copy the full SHA
    983054e View commit details
  2. Merge pull request #133 from ONSdigital/move-tests

    Clarify test naming structure
    arthompson authored Jan 9, 2023
    Copy the full SHA
    2747b4c View commit details

Commits on Jan 16, 2023

  1. Bump pytest from 7.2.0 to 7.2.1

    Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.2.0 to 7.2.1.
    - [Release notes](https://github.com/pytest-dev/pytest/releases)
    - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
    - [Commits](pytest-dev/pytest@7.2.0...7.2.1)
    
    ---
    updated-dependencies:
    - dependency-name: pytest
      dependency-type: direct:development
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Jan 16, 2023
    Copy the full SHA
    abc6980 View commit details

Commits on Jan 17, 2023

  1. Lock Rewritten.

    Piwington committed Jan 17, 2023
    Copy the full SHA
    116addb View commit details
  2. Merge pull request #136 from ONSdigital/dependabot/pip/pytest-7.2.1

    Bump pytest from 7.2.0 to 7.2.1
    Piwington authored Jan 17, 2023
    Copy the full SHA
    149663f View commit details
  3. Bump coverage from 7.0.3 to 7.0.5

    Bumps [coverage](https://github.com/nedbat/coveragepy) from 7.0.3 to 7.0.5.
    - [Release notes](https://github.com/nedbat/coveragepy/releases)
    - [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst)
    - [Commits](nedbat/coveragepy@7.0.3...7.0.5)
    
    ---
    updated-dependencies:
    - dependency-name: coverage
      dependency-type: direct:development
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Jan 17, 2023
    Copy the full SHA
    3231fdd View commit details
  4. Lock Rewritten.

    Piwington committed Jan 17, 2023
    Copy the full SHA
    12ebc64 View commit details
  5. Merge pull request #135 from ONSdigital/dependabot/pip/coverage-7.0.5

    Bump coverage from 7.0.3 to 7.0.5
    Piwington authored Jan 17, 2023
    Copy the full SHA
    3236514 View commit details

Commits on Feb 3, 2023

  1. Unneeded Cols

    Piwington committed Feb 3, 2023
    Copy the full SHA
    2a79fab View commit details
  2. Copy the full SHA
    120efb7 View commit details
  3. Copy the full SHA
    f8bcecc View commit details
  4. Kwargs

    Piwington committed Feb 3, 2023
    Copy the full SHA
    2e3708c View commit details
  5. Update Tests

    Piwington committed Feb 3, 2023
    Copy the full SHA
    2f10c6c View commit details
  6. Output?

    Piwington committed Feb 3, 2023
    Copy the full SHA
    5f65002 View commit details
  7. Sort per category tests

    arthompson committed Feb 3, 2023
    Copy the full SHA
    7c007a6 View commit details
  8. Tests Working

    Piwington committed Feb 3, 2023
    Copy the full SHA
    82c754c View commit details
  9. Copy the full SHA
    bf581b1 View commit details
  10. Release Notes

    Piwington committed Feb 3, 2023
    Copy the full SHA
    d01e85e View commit details

Commits on Feb 6, 2023

  1. Update 9.1.0.md

    Piwington authored Feb 6, 2023
    Copy the full SHA
    8596129 View commit details
  2. Copy the full SHA
    57d1a2f View commit details
  3. Alter release notes for 9.1.0

    - Removed notes about testing since that change won't impact users who are
      the target audience
    - Altered the explanation of the issue being addressed to hopefully clarify to
      users
    - Added a note on the effect of the prior bug and recommendations for
      remediation
    arthompson committed Feb 6, 2023
    Copy the full SHA
    fc76980 View commit details
  4. Fix line length

    arthompson committed Feb 6, 2023
    Copy the full SHA
    b2ee324 View commit details
  5. Merge pull request #141 from ONSdigital/spp-8508

    Spp 8508
    Piwington authored Feb 6, 2023
    Copy the full SHA
    a805546 View commit details
Showing 319 changed files with 10,428 additions and 4,343 deletions.
3 changes: 0 additions & 3 deletions .flake8

This file was deleted.

6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -6,3 +6,9 @@ updates:
interval: "daily"
ignore:
- dependency-name: pyspark
- package-ecosystem: github-actions
directory: "/"
schedule:
interval: "daily"
ignore:
- dependency-name: abatilo/actions-poetry
20 changes: 8 additions & 12 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
# Checklist
## Synopsis

- [ ] Documentation created/updated
- [ ] If documentation descoped, a JIRA Ticket has been created to complete
the documentation

- [ ] Deployed and tested in a sandbox/dev environment
- [ ] Confirmed that no breakage to contract with automated testing/other teams
and remedial PRs or tickets raised.
Briefly describe the purpose of the pr.

Please briefly summarise how the PR has been tested:
## Checklist

## JIRA references
- [ ] Documentation created/updated
- [ ] Tests created/updated

**Feature:** SPP-
## Description

**Task/Story:** SPP-
Add a more detailed description of the pr if necessary (can reference release
notes if included).
140 changes: 41 additions & 99 deletions .github/workflows/ci-checks.yaml
Original file line number Diff line number Diff line change
@@ -2,148 +2,90 @@ name: CI Checks

on: [push]

permissions:
statuses: write
checks: write
contents: read

jobs:
build:
runs-on: ubuntu-latest
strategy:
max-parallel: 4
matrix:
python-version: [3.7]
java-version: ['8']
fail-fast: false
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v1
with:
python-version: ${{ matrix.python-version }}
- uses: actions/setup-java@v2
with:
distribution: 'adopt'
java-version: ${{ matrix.java-version }}
- name: Run image
uses: abatilo/actions-poetry@v2.0.0
with:
poetry-version: 1.1.6
- name: Install dependencies
run: poetry install
- name: build
run: poetry build
test:
runs-on: ubuntu-latest
strategy:
max-parallel: 4
matrix:
python-version: [3.7]
python-version: ['3.7', '3.8', '3.9', '3.10']
java-version: ['8']
fail-fast: false
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v1
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- uses: actions/setup-java@v2
- uses: actions/setup-java@v4
with:
distribution: 'adopt'
java-version: ${{ matrix.java-version }}
- name: Run image
uses: abatilo/actions-poetry@v2.0.0
with:
poetry-version: 1.1.6
- name: Install dependencies
run: poetry install
- name: test
run: poetry run pytest --tap-stream --cov-report=html --junitxml=junit.xml
- name: Upload Test report
- name: Run image ${{matrix.python-version}}
uses: abatilo/actions-poetry@v2.4.0
with:
poetry-version: 1.5.1
- name: Test ${{matrix.python-version}}
run: |-
set -e
poetry install
poetry run pytest --tap-stream --cov-report=lcov:lcov-${{matrix.python-version}}.info --junitxml=junit-${{matrix.python-version}}.xml
- name: Upload Test report ${{matrix.python-version}}
uses: dorny/test-reporter@v1
if: success() || failure()
with:
name: test-results
path: junit.xml
name: test-results-${{matrix.python-version}}
path: junit-${{matrix.python-version}}.xml
reporter: java-junit
fail-on-error: false
- name: upload-coverage-report
uses: actions/upload-artifact@v2
- name: upload-coverage-report-${{matrix.python-version}}
uses: actions/upload-artifact@v4
with:
name: coverage-report
path: htmlcov/
if-no-files-found: warn
name: coverage-report-${{matrix.python-version}}-lcov
path: lcov-${{matrix.python-version}}.info
flake8:
runs-on: ubuntu-latest
strategy:
max-parallel: 4
matrix:
python-version: [3.7]
java-version: ['8']
fail-fast: false
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v1
with:
python-version: ${{ matrix.python-version }}
- uses: actions/setup-java@v2
with:
distribution: 'adopt'
java-version: ${{ matrix.java-version }}
- name: Run image
uses: abatilo/actions-poetry@v2.0.0
with:
poetry-version: 1.1.6
- name: Install dependencies
run: poetry install
- name: run flake8
run: poetry run flake8 statistical_methods_library tests
isort:
runs-on: ubuntu-latest
strategy:
max-parallel: 4
matrix:
python-version: [3.7]
java-version: ['8']
fail-fast: false
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v1
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- uses: actions/setup-java@v2
with:
distribution: 'adopt'
java-version: ${{ matrix.java-version }}
- name: Run image
uses: abatilo/actions-poetry@v2.0.0
uses: abatilo/actions-poetry@v2.4.0
with:
poetry-version: 1.1.6
- name: Install dependencies
run: poetry install
- name: run isort
run: poetry run isort --check-only statistical_methods_library tests
poetry-version: 1.5.1
- name: Run flake8
run: |-
poetry install
poetry run flake8 statistical_methods_library tests
black:
runs-on: ubuntu-latest
strategy:
max-parallel: 4
matrix:
python-version: [3.7]
java-version: ['8']
fail-fast: false
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v1
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- uses: actions/setup-java@v2
with:
distribution: 'adopt'
java-version: ${{ matrix.java-version }}
- name: Run image
uses: abatilo/actions-poetry@v2.0.0
uses: abatilo/actions-poetry@v2.4.0
with:
poetry-version: 1.1.6
- name: Install dependencies
run: poetry install
- name: run black
run: poetry run black --check --diff statistical_methods_library tests
poetry-version: 1.5.1
- name: Run Black
run: |-
poetry install
poetry run black --check --diff statistical_methods_library tests
2 changes: 1 addition & 1 deletion .github/workflows/dependabot-auto-merge.yml
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest
if: ${{ github.actor == 'dependabot[bot]' && github.event.workflow_run.conclusion == 'success' }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
ref: ${{ github.event.workflow_run.head_branch }}
- name: Auto-approve Dependabot PR
46 changes: 0 additions & 46 deletions .github/workflows/package-release-artifact.yml

This file was deleted.

34 changes: 34 additions & 0 deletions .github/workflows/release-code.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Release code

on:
push:
tags:
- "*"

jobs:
build:
name: Build and release artifact
runs-on: ubuntu-latest
strategy:
max-parallel: 4
fail-fast: false
steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: '3.10'
- name: Run image
uses: abatilo/actions-poetry@v3.0.0
with:
poetry-version: 1.5.1
- name: build
run: poetry build
- name: Create GitHub release
uses: softprops/action-gh-release@v2
with:
files: |
dist/*.whl
dist/*.tar.gz
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -121,8 +121,8 @@ venv.bak/
.devcontainer/
# Editor backup files
*~
# portray generated docs
site/

# asdf tool versions
.tool-versions

# libreoffice lock files (sometimes used when editing csvs)
*.~lock.*
3 changes: 0 additions & 3 deletions .isort.cfg

This file was deleted.

21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2023 Crown Copyright (Office for National Statistics)

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
18 changes: 18 additions & 0 deletions catalog-info.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
apiVersion: backstage.io/v1alpha1
kind: Component
metadata:
name: statistical-methods-library
description: The Statistical Methods Library (S.M.L.) is a set of approved statistical methods.
annotations:
jira/project-key: SPP
github.com/project-slug: ONSdigital/statistical-methods-library
tags:
- python
- spp
- sml
links:
icon: search
spec:
type: library
lifecycle: production
owner: group:spp-results
Loading