Skip to content
This repository was archived by the owner on Feb 6, 2025. It is now read-only.

Commit 233d82a

Browse files
Merge pull request #26 from lumicks/25-update-to-dolt-1160
25 update to dolt 1160
2 parents 2657651 + ffb6f3c commit 233d82a

File tree

4 files changed

+9
-11
lines changed

4 files changed

+9
-11
lines changed

.github/workflows/unit_tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
matrix:
1919
python-version: ['3.8', '3.9', '3.10']
2020
os: [ubuntu-latest, windows-latest]
21-
dolt-version: ['1.15.0']
21+
dolt-version: ['1.16.0']
2222
runs-on: ${{ matrix.os }}
2323

2424
steps:

CHANGELOG.md

+6-5
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,15 @@ This document follows the conventions laid out in [Keep a CHANGELOG](https://kee
1515
## [Unreleased](https://github.com/lumicks/doltcli/compare/v0.2.0...HEAD)
1616

1717
### Added
18-
- Add CODEOWNERS file. [#24](https://github.com/lumicks/doltcli/pull/24)
19-
- Add 'remote' and 'all' options to branch command. [#20](https://github.com/lumicks/doltcli/pull/20)
18+
- Add 'remote' and 'all' options to branch command [#20](https://github.com/lumicks/doltcli/pull/20).
19+
- Add CODEOWNERS file [#24](https://github.com/lumicks/doltcli/pull/24).
2020

2121
### Changed
22-
- Update tests to work with dolt 1.15.0. [#22](https://github.com/lumicks/doltcli/pull/22)
23-
- Bump dolt version to 1.15.0. [#22](https://github.com/lumicks/doltcli/pull/22)
22+
- Bump dolt version to 1.16.0 [#26](https://github.com/lumicks/doltcli/pull/26).
23+
- Update tests to work with dolt 1.15.0 [#22](https://github.com/lumicks/doltcli/pull/22).
24+
- Bump dolt version to 1.15.0 [#22](https://github.com/lumicks/doltcli/pull/22).
2425

25-
## [v0.2.0](https://github.com/lumicks/doltcli/releases/tag/v0.1.18) - 2023-09-13
26+
## [v0.2.0](https://github.com/lumicks/doltcli/releases/tag/v0.2.0) - 2023-09-13
2627

2728
### Added
2829
- Add remote and branch to BranchT class to handle updated version of dolt

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ questions regarding production use-cases.
2424

2525
- clone repo
2626
- Python 3.6+ required
27-
- [Install Dolt binary](https://docs.dolthub.com/getting-started/installation). Currently recommended version is [1.15.0](https://github.com/dolthub/dolt/releases/tag/v1.15.0).
27+
- [Install Dolt binary](https://docs.dolthub.com/getting-started/installation). Currently recommended version is [1.16.0](https://github.com/dolthub/dolt/releases/tag/v1.16.0).
2828
- [Install Poetry](https://python-poetry.org/docs/#installation)
2929
```bash
3030
curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python -

doltcli/utils.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -184,10 +184,7 @@ def writer(filepath: str):
184184
for row in rows:
185185
fieldnames = fieldnames.union(set(row.keys()))
186186

187-
# TODO: this is only needed to make sure test_update_rows passes until an issue
188-
# with dolt table import -u is addressed:
189-
# https://github.com/dolthub/dolt/issues/6675
190-
csv_writer = csv.DictWriter(f, sorted(fieldnames))
187+
csv_writer = csv.DictWriter(f, fieldnames)
191188
csv_writer.writeheader()
192189
csv_writer.writerows(rows)
193190
return filepath

0 commit comments

Comments
 (0)