Skip to content
This repository has been archived by the owner on Sep 29, 2023. It is now read-only.

Consolidated v4 fixes #9

Open
wants to merge 126 commits into
base: main
Choose a base branch
from
Open

Consolidated v4 fixes #9

wants to merge 126 commits into from

Conversation

JeffreyFG
Copy link

  1. Small correction to the comment on which type of dataset is the default option. Perviously the comment stated that the default dataset type was raw. The dataset type is important because based on that the client would try to post a the scicat server with a different route this has been changed but the comment needed to be updated to reflect this change.
  2. archiveId is no longer part of the OrigDatablock but chkAlg is.

nitrosx and others added 30 commits January 28, 2022 09:30
@nitrosx
Integrated code developed at ESS, so far
6557773
@dylanmcreynolds
REL: v0.2.1
c9ae0a1
@dylanmcreynolds
url fix
7d05274
@dylanmcreynolds
REL: v0.2.2
0b6f6dc
@dylanmcreynolds
Merge pull request SciCatProject#8 from dylanmcreynolds/easy_url
b901bac 
Easy url
@nitrosx
Merge branch 'main' of https://github.com/SciCatProject/pyscicat into…
e3b0802 
… ESS-adding-in-house-functionalities
@nitrosx
Merge branch 'als-computing:main' into ESS-adding-in-house-functional…
ece5f75 
…ities
@nitrosx
Fixed linting issues
c63e3e2
@nitrosx
Merge branch 'ESS-adding-in-house-functionalities' of https://github.…
e68745e 
…com/SciCatProject/pyscicat into ESS-adding-in-house-functionalities
@nitrosx
Fixed issue in update_dataset_origdatablock
90b64f0
@nitrosx
added documentation and example
df29d4c
@nitrosx
fixed linting
fd40529
@nitrosx
updated documentation, included new documentation under how-to sectio…
56d2d34 
…n of documentation, updated example. Added packages in requirements to requirements-dev.
@nitrosx
removed production packages from requirements-dev
e7ebd0e
@nitrosx
Renamed example script, added test for new functions
ab46162
@nitrosx
Fixed linting
d13e053
@dylanmcreynolds
Merge pull request SciCatProject#10 from SciCatProject/ESS-adding-in-…
399e349 
…house-functionalities

Ess adding in house functionalities
@nitrosx
Added function to delete dataset by pid
834e9ce
@abigailalexander
Added raw and derived upsert functions
5cfed34
@nitrosx
added functions to load dataset by id and related orig_datablocks
832b476
@abigailalexander
Added upsert_dataset. Fixed bug in upsert funcs
96155e1
@abigailalexander
Removed unneeded f in log/error statements causing bug
d7b2330
@abigailalexander
Added initial upsert test
094ce4d
@nitrosx
Added model and method for PublishedData
e0c27ec
@nitrosx
Fixing bugs in published data functions
85877f3
@abigailalexander
Fixed urls for upsert func and test
5f0205c
@dylanmcreynolds
remove pre-commit and re-add flake8
9d31fe3
@dylanmcreynolds
More remove pre-commit files
46737e1
@dylanmcreynolds
remove pre-commit
982793c
@dylanmcreynolds
Merge pull request SciCatProject#15 from dylanmcreynolds/remove-pre-c…
0ff79d7 
…ommit

remove pre-commit
LAShemilt and others added 28 commits June 6, 2023 07:38
@LAShemilt
testing update dataset now that the getter methods work
291858f
@LAShemilt
move the integration tests out into their own package so they can be …
e0371e3 
…ignored by the current actions workflows.
@LAShemilt
first attempt at an actions workflow to do the integration testing.
b2336fa
@LAShemilt
changing linting and adding steps
dddf664
@LAShemilt
changing linting and adding steps
f677054
@LAShemilt
correct name for the scicat backend service
6b84741
@LAShemilt
adding environmental variables
88343de
@LAShemilt
remove subtests dependency
452df36
@LAShemilt
solving merge
ecd84c4
@LAShemilt
removing methods from v4
b5e7ffb
@LAShemilt
remove erroneous line in coverage stage of integration-testing.yml
d3ff9d1
@LAShemilt
replace pip install from requirements-dev.txt with the .[dev] option …
8350d3c 
…from the setup config.
@LAShemilt
updating the tests mocks to be inline with the new backend
420f88b
@LAShemilt
liniting
75c1f9a
@LAShemilt
updating deprecated config - license_file to license_files
55d0f38
@LAShemilt
excluding continuous_integration folder that is used in workflows but…
6f13a4e 
… is not part of package
@LAShemilt
run just the integration tests
a66551b
@dylanmcreynolds
Merge pull request SciCatProject#40 from rosalindfranklininstitute/v4…
16a5e98 
…-datasets

V4 datasets
@LAShemilt
removing quotation marks that causes pypi to fail
46a69f4
@dylanmcreynolds
Merge pull request SciCatProject#41 from rosalindfranklininstitute/se…
5ad874b 
…tup-cfg-hotfix

removing quotation marks that causes pypi to fail
add default value None for all optional parameters
70a4032
update to flake8-6.1
a30a4ac
pydantic v2 no longer converts int to str automatically
3628eb9
@dylanmcreynolds
Merge pull request SciCatProject#46 from eilmiv/pydantic_v2_compatible
f321072 
Support newer versions of pydantic
@JeffreyFG
This commit makes a small change with the client in order to better s…
c3cbb2f 
…upport the current routes available on the newest version(v4.x) of the scicat backend. It also makes a small change to the OrigDatablock to support what is required in the new backend.
@JeffreyFG
removed unnecessary comment about datasetType
23e56fd
@JeffreyFG
fixed small comment error about which dataset is default
d0c2a57
@JeffreyFG
Update model.py
b7170c2 
ownerGroup will now longer be required by the pydantic model and because the backend will not accept it
@dylanmcreynolds
Copy link
Contributor

Can you please rebase so that the PR contains just your commits? Something like this: https://stackoverflow.com/a/45286781

Thanks!

@dylanmcreynolds
Copy link
Contributor

Oh I see. I should archive this repo. My apologies. We moved this to https://github.com/scicatproject/pyscicat

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@JeffreyFG @dylanmcreynolds @nitrosx @abigailalexander @LAShemilt @jl-wynen @zjttoefs @toqduj