Skip to content

Fix conflict#320

Merged
giro090 merged 8 commits intodevfrom
fix-conflict
Oct 16, 2025
Merged

Fix conflict#320
giro090 merged 8 commits intodevfrom
fix-conflict

Conversation

@giro090
Copy link
Copy Markdown
Contributor

@giro090 giro090 commented Oct 16, 2025

Proposed Changes

  • Temporary fix to merge conflict

Related Issues

NA

Pre-requisites

This section may not be fully required if the branch is not merging into main.
Please indicate items that aren't necessary and why, with comments around incomplete checks.

  • Version number has been incremented, according to SemVer NA
  • Changelog has been updated, listing changes to this version. Use the keep a changelog format NA
  • New features are tested NA
  • New features are documented using the numpydoc docstring format NA
  • Other relevant package documentation is updated NA
  • For new functionality, examples are included in the docs or a feature request has
    been made for it/them. NA

giro090 and others added 8 commits September 2, 2025 13:57
Bumps [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish) from 1.12.3 to 1.13.0.
- [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases)
- [Commits](pypa/gh-action-pypi-publish@v1.12.3...v1.13.0)

---
updated-dependencies:
- dependency-name: pypa/gh-action-pypi-publish
  dependency-version: 1.13.0
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@giro090 giro090 changed the base branch from main to dev October 16, 2025 09:16
Copy link
Copy Markdown
Contributor

@Jday7879 Jday7879 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It does have the same line twice but hopefully this fixes conflict for now

@giro090 giro090 merged commit 4583029 into dev Oct 16, 2025
1 of 2 checks passed
@giro090 giro090 deleted the fix-conflict branch October 16, 2025 09:24
shilohd pushed a commit that referenced this pull request Nov 11, 2025
* update python versions, update action version

* update required python version

* upgrade setuptools in linux ci

* upgrade setuptools in windows ci

* add build step to ci

* update readme, add install steps

* update installation instructions

* fix link, formatting, add install detail

* add hooks, update config, update readme

* Revert "add hooks, update config, update readme"

This reverts commit 9d6b8cd.

* update read the docs config (#267)

* update read the docs config

* remove python version key

* update readthedocs config

* fix typo in config

* remove pages workflow

* remove built_and_deploy action

* add hooks, update readme, update config (#264)

* add hooks, update readme, update config

* update workflows

* update workflows

* update hooks step in workflow

* move precommit check in workflows

* update pr template, readme, remove secret files

* Update bandit to skip checking for asserts in unit tests

* bulk formatting changes from commit hooks

* Add bandit excl. for pickle

* Add bandit excl. for pickle

* update config, add excl to init

* add flake8 config

* remove unused imports, update comment hashes

* remove unused imports, f-strings, update comparisons

* update flake8 config

* precommit black formatter gptable.py

* precommit flake8 black formatting

* precommit isort black formatting wrappers

* precommit isort cover test

* precommit isort pickle themes

* precommit isort unpickle themes

* Fix circular imports (#266)

* update imports

* add importlib_resources to imports

* fix .toml syntax

* move fixture

* fix pre-commit formatting

* change type to string

* fix precommit formatting

* fix hyperlinks, color checks

* add actual workbook to gitignore

* make comparison test less strict on auto font@

* add if ignore color var, formatting

* update xlsxwriter dependency req

---------

Co-authored-by: Jday7879 <57715292+Jday7879@users.noreply.github.com>

* Use cell_autofit_width to calculate column widths

* Run pre-commits

* Import cell_autofit_width

* Update test__calculate_column_widths and remove test__longest_line_length

* Add CODEOWNERS file (#281)

* Add CODEOWNERS file

* add whitespace

---------

Co-authored-by: Rosetta <135234996+gisellerosetta@users.noreply.github.com>

* Make column widths adjust for font size and bold formatting, and update tests

* Update requirements in .toml (#283)

* Make auto_width parameter able to be a dict to specify which sheets to apply auto_width to

* Add datetime test input

* 232 pytest regressions plugin (#285)

* Update test_end_to_end to use pytest-regressions plugin

* Add pytest-regressions to dev requirements

* Add capitalisation into _get_scaling_factor

* Add two examples to demonstrate end to end process and wide vs long format (#288)

* add two examples to demonstrae end to end process and wide vs long format

* Run pre-commits

---------

Co-authored-by: daviel9 <Luke.Davies@ons.gov.uk>

* 271 mkdocs dev (#291)

* Add issue 265 to closed issues

* Update closed_issue_log.md

* Update closed_issue_log.md

* Bump pypa/gh-action-pypi-publish in /.github/workflows (#279)

Bumps [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish) from 1.12.3 to 1.13.0.
- [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases)
- [Commits](pypa/gh-action-pypi-publish@v1.12.3...v1.13.0)

---
updated-dependencies:
- dependency-name: pypa/gh-action-pypi-publish
  dependency-version: 1.13.0
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update closed_issue_log.md

* Update closed_issue_log.md

* Update closed_issue_log.md

* convering rst to md

* update reqs

* clear up files, map existing layout

* remove sphinx docs, restructure docs folder, fix anchors

* add auto docstrings

* reconfigure pages, fix anchors

* run pre-commit hooks

* update changelog

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: jday7879 <57715292+Jday7879@users.noreply.github.com>

* Add gh pages ci (#293)

* add docs workflow, add docs build folder to gitignore

* change dependencies file

* run pre-commit hooks

* fix bug to allow formatting of multiple individual cells (#296)

* fix bug to allow formatting of multiple individual cells

* update cell format loop

---------

Co-authored-by: Rosetta <135234996+gisellerosetta@users.noreply.github.com>

* Update expected_workbook.xlsx

* Update  gptables/test/test_api/test_end_to_end.xlsx file

* 287 restructure docs (#297)

* template restructure

* restructure docs

* run hooks

* update changelog

* add mkdocs-material for subheading support, add multi sheets example

* run hooks

* Delete closed_issue_log.md

* Update feature_request.md

* Update feature_request.md

* Update feature_request.md

* Update pull_request_template.md

* update changelog

* Add exception catching and example of note entry with no link in peng… (#294)

* Add exception catching and example of note entry with no link in penguins_notes.py

* Run pre-commits

---------

Co-authored-by: daviel9 <Luke.Davies@ons.gov.uk>

* set up examples page, add collapsible code segment docs add ons (#303)

* Fix conflict (#318)

* Add issue 265 to closed issues

* Update closed_issue_log.md

* Update closed_issue_log.md

* Bump pypa/gh-action-pypi-publish in /.github/workflows (#279)

Bumps [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish) from 1.12.3 to 1.13.0.
- [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases)
- [Commits](pypa/gh-action-pypi-publish@v1.12.3...v1.13.0)

---
updated-dependencies:
- dependency-name: pypa/gh-action-pypi-publish
  dependency-version: 1.13.0
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update closed_issue_log.md

* Update closed_issue_log.md

* Update closed_issue_log.md

* run pre-commits

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Fix conflict (#320)

* Add issue 265 to closed issues

* Update closed_issue_log.md

* Update closed_issue_log.md

* Bump pypa/gh-action-pypi-publish in /.github/workflows (#279)

Bumps [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish) from 1.12.3 to 1.13.0.
- [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases)
- [Commits](pypa/gh-action-pypi-publish@v1.12.3...v1.13.0)

---
updated-dependencies:
- dependency-name: pypa/gh-action-pypi-publish
  dependency-version: 1.13.0
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update closed_issue_log.md

* Update closed_issue_log.md

* Update closed_issue_log.md

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Fix conflict (#321)

* Add issue 265 to closed issues

* Update closed_issue_log.md

* Update closed_issue_log.md

* Bump pypa/gh-action-pypi-publish in /.github/workflows (#279)

Bumps [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish) from 1.12.3 to 1.13.0.
- [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases)
- [Commits](pypa/gh-action-pypi-publish@v1.12.3...v1.13.0)

---
updated-dependencies:
- dependency-name: pypa/gh-action-pypi-publish
  dependency-version: 1.13.0
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update closed_issue_log.md

* Update closed_issue_log.md

* Update closed_issue_log.md

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Fix conflict (#322)

* Add issue 265 to closed issues

* Update closed_issue_log.md

* Update closed_issue_log.md

* Bump pypa/gh-action-pypi-publish in /.github/workflows (#279)

Bumps [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish) from 1.12.3 to 1.13.0.
- [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases)
- [Commits](pypa/gh-action-pypi-publish@v1.12.3...v1.13.0)

---
updated-dependencies:
- dependency-name: pypa/gh-action-pypi-publish
  dependency-version: 1.13.0
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update closed_issue_log.md

* Update closed_issue_log.md

* Update closed_issue_log.md

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* revert action version, use hooks

* add basic example, update commentary, add picture (#325)

* add basic example, update commentary, add picture

* run hooks

* blue in python is #0000FF which passes the WCAG AA contrast check, added comment to clarify in the wrapper function

* update intro, add picture (#326)

* update intro, add picture

* run hooks

* fix typos and broken link

---------

Co-authored-by: rowlec1 <charlotte.rowley@ons.gov.uk>

* running commit hooks

* add cover sheet example, correct typo in api/Cover.md and starting out example

* Remove warnings (#332)

* run precommit hooks

* add basic example, template cover section

* add cover sheet example, run hooks

* run hooks

* 308 add formatting how-to (#333)

* restructure how-to example, add picture, rename example

* pre-commit hooks

* add note about competing formatting

* make api reference table page

* 311 cleanup toc (#336)

* begin toc example

* add table of contents customisation example, delete api page

* run hooks

* fix typo

* add type hints to code and updated mkdocstrings config

* Handle None defaults for optional dict/list args to prevent TypeError

* Set index_columns={2: 0} in make_table_of_contents to pass test

* 310 clean up gptable api page (#339)

* move gptable api page info to additional formatting page

* run pre-commit hooks and fix broken link

* update elements text, add image with table of contents

* hooks

* 335 investigate column alignment (#342)

* dropping repeated column in copy of table to correctly convert dtypes

* added catch for if index_col is empty and first type is numeric, should correctly format this to left aligned

* remove code used in testing

* Deprecate contentsheet (#324)

* remove contentsheet deprecation notes, run precommits

* update changelog

* 304 update notes example (#340)

* update tutorial.md Notes section with code chunks, pics and full process in a collapsible.

* shuffle text, remove heading formats

* hooks

---------

Co-authored-by: Rosetta <135234996+gisellerosetta@users.noreply.github.com>

* 314 review api section (#344)

* split api reference, remove tables of contents api page

* add functions pages, link in api ref

* clean up cover page

* clean up gptable page, change page order

* add GPWorkbook, GPWorksheet pages, remove wrappers page

* clean up theme page

* add theme link to api ref

* remove notes info from api

* update docstrings, move functions/classes into sections

* fix links

* run hooks

* fix typo

* 307 update the how to multiple sheets example (#345)

* Add multiple sheets to end of tutorial

* Fix typo

* adding extension to copy codeblocks directly (#346)

* 300 Deprecate GPTable.table.columns for note referencing (#338)

* deprecate GPTable.table.columns for note referencing

* remove duped code

* refactor _reference_table_annotations to use table_notes instead of parsing header tokens, simplify set_table_notes, update related tests

---------

Co-authored-by: Rosetta <135234996+gisellerosetta@users.noreply.github.com>

* 312 review examples (#347)

* redraft tutorial

* update table of contents tutorial

* update multiple sheets example

* edit multi sheets example

* edit starting out text

* update tutorial text

* edit starting out example

* update notes example

* update cover tutorial

* remove tutorial output

* update multiple sheets example

* remove path from imports

* update tutorial images

* run hooks

* update text

* 316 docs clean up (#350)

* remove use in R with reticulate

* remove customisation line in mkdocs

* Update contributing guidance, update contributors, link to Presentation Champions page

* fix typo

* remove r section

* update contributors page

* remove table of contents api page

* update contributing, remove customisation

* run hooks, remove unneeded page

---------

Co-authored-by: Rosetta <135234996+gisellerosetta@users.noreply.github.com>

* 315 review how tos (#348)

* remove unneeded pages from config

* remove unneeded pages

* update using add. formatting, add link to xlsxwriter

* update filename

* update add. formatting image

* minor text formatting, add text format image

* update subtitles, update filenames

* update links, link text

* run hooks

* fix typo

* fix typo

* remove import

* add glossary (#351)

* add glossary

* hooks

* Misc cleanup (#352)

* update codeowners

* update defaults

* update gitignore

* update changelog

* update readme

* Update pyproject.toml (#354)

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Jday7879 <57715292+Jday7879@users.noreply.github.com>
Co-authored-by: daviel9 <Luke.Davies@ons.gov.uk>
Co-authored-by: Luke Davies <117165341+ldavies99@users.noreply.github.com>
Co-authored-by: Sara-Jade-O <sara-jade.oman@ons.gov.uk>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Charlotte Rowley <92380396+CHCRowley@users.noreply.github.com>
Co-authored-by: ellie-o <131752277+ellie-o@users.noreply.github.com>
Co-authored-by: jae_hee <jaehee.ryoo@ons.gov.uk>
Co-authored-by: rowlec1 <charlotte.rowley@ons.gov.uk>
Co-authored-by: jae_hee <32328379+addledrabbit@users.noreply.github.com>
Co-authored-by: giuliag92 <135708493+giuliag92@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants