Skip to content

Commit

Permalink
Fix conflics
Browse files Browse the repository at this point in the history
  • Loading branch information
stuartmcalpine committed Jun 4, 2024
2 parents 7661150 + 6457b82 commit 7a80a97
Show file tree
Hide file tree
Showing 14 changed files with 161 additions and 442 deletions.
36 changes: 33 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,12 @@ jobs:
fail-fast: false

matrix:
python-version: ["3.9"]
python-version: ["3.10"]
include:
- python-version: 3.9
if: github.event_name == 'pull_request'
- python-version: 3.11
if: github.event_name == 'pull_request'

# Our CI steps for this job.
steps:
Expand All @@ -54,6 +59,11 @@ jobs:
python -m pip install .
python -m pip install pytest
# GitPython is needed when creating a new database
- name: Install GitPython
run: |
python -m pip install GitPython
# Make a dummy config file.
- name: Create dummy config file
run: |
Expand Down Expand Up @@ -105,7 +115,12 @@ jobs:
fail-fast: false

matrix:
python-version: ["3.9"]
python-version: ["3.10"]
include:
- python-version: 3.9
if: github.event_name == 'pull_request'
- python-version: 3.11
if: github.event_name == 'pull_request'

# Our CI steps for this job.
steps:
Expand All @@ -126,6 +141,11 @@ jobs:
python -m pip install .
python -m pip install pytest
# GitPython is needed when creating a new database
- name: Install GitPython
run: |
python -m pip install GitPython
# Make a dummy config file.
- name: Create dummy config file
run: |
Expand Down Expand Up @@ -162,7 +182,12 @@ jobs:
fail-fast: false

matrix:
python-version: ["3.9"]
python-version: ["3.10"]
include:
- python-version: 3.9
if: github.event_name == 'pull_request'
- python-version: 3.11
if: github.event_name == 'pull_request'

# Our CI steps for this job.
steps:
Expand All @@ -183,6 +208,11 @@ jobs:
python -m pip install .
python -m pip install pytest
# GitPython is needed when creating a new database
- name: Install GitPython
run: |
python -m pip install GitPython
# Make a dummy config file.
- name: Create dummy config file
run: |
Expand Down
23 changes: 21 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
## Version 0.4.2
## Version 0.5.1

Add ability to tag datasets with keywords/labels to make them easier to catagorize.
Add ability to tag datasets with keywords/labels to make them easier to
catagorize.

- Can tag keywords when registering datasets through the Python API or CLI. Can
add keywords after registration using the `add_keywords()` method in the
Expand All @@ -18,6 +19,24 @@ Add ability to tag datasets with keywords/labels to make them easier to catagori
- Added keywords information to the documentation
- Can run `dregs show keywords` from CLI to display all pre-registered keywords

## Version 0.5.0

Separate out creation of production schema and non-production schema since,
under normal circumstances, there will be a single "real" production schema
(owner type == production only) but possibly multiple non-production schemas to
keep track of entries for the other owner types. Add a field to the provenance
table so a schema can discover the name of its associated production schema and
form foreign key constraints correctly.

Bumped database version to 2.3.0. This code requires database version >= 2.3.0

## Version 0.4.2

- Add check during dataset registration to raise an exception if the `root_dir`
does not exist
- Add check before copying any data (i.e., `old_location != None`) that the
user has write permission to the `root_dir` folder.

## Version 0.4.1

Add ability to register "external" datasets. For example datasets that are not
Expand Down
8 changes: 6 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,20 @@ authors = [
license = { file = "LICENCE" }
classifiers = [
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
]
keywords = ["desc", "python", "registry"]
# NOTE: Those needing to create a database will also need to install the
# GitPython package. It is not needed for accessing an existing db.
dependencies = [
'psycopg2',
'sqlalchemy',
'pyaml',
'GitPython',
'pandas'
]
requires-python = ">=3.7" # For setuptools >= 61.0 support
requires-python = ">=3.9,<3.12" # Supported versions (in CI)

[tool.setuptools.dynamic]
version = {attr = "dataregistry._version.__version__"}
Expand Down
Loading

0 comments on commit 7a80a97

Please sign in to comment.