Skip to content

ometa (squashed history) #193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 66 commits into from
Jan 21, 2022
Merged

ometa (squashed history) #193

merged 66 commits into from
Jan 21, 2022

Conversation

@joshmoore
Copy link
Member

@joshmoore joshmoore commented Jan 11, 2022 •
edited
Loading

Like #192 but with history and #192 but with initial commits squash:

  • the initial non-user-scripts history has been squashed with git rebase -i --rot
  • followed by rebasing the reset on top of the squashed commit with git rebase -i --rebase-merges --onto squashed-history cb4f07f HEAD

cc: @will-moore @sbesson

Original description from @CFGrote:

This PR adds scripts originally maintained by @evenhuis to support bulk annotation via csv files and dataset descriptions. The original code was ported to python3, bugs fixed and rudimentary tests added.

Marked as Draft here and seeking feedback and contributions from @will-moore , @ahamacher and others as discussed in this images.sc thread.

joshmoore and others added 30 commits January 11, 2022 11:33
@joshmoore
Initial commit (squash original history)
15a63c8
@evenhuis @joshmoore
Update README.md
bb4705d
@evenhuis @joshmoore
Update README.md
77f3368
@joshmoore
Initial commit for add / remove scripts
62a7e06
@evenhuis @joshmoore
Update README.md
ddf78e4
@joshmoore
Updated the readme
0ae2018
@evenhuis @joshmoore
Update README.md
2e9450c
@joshmoore
First attempt at csv KV data
b681350
@joshmoore
Merge branch 'master' of https://github.com/evenhuis/omero-user-scripts
21538fd
@evenhuis @joshmoore
Update README.md
7e09f3f
@joshmoore
cleaned up key-val adding
24e12c4
@joshmoore
Merge branch 'master' of https://github.com/evenhuis/omero-user-scripts
3e9de54
@joshmoore
initial commit of Create_Metadata_from_csv.py
6c6bbdb
@joshmoore
changed name
23d0d50
@joshmoore
renamed add_key_val to reflect filename focus
b51dce3
@evenhuis @joshmoore
Added KV from description
30cd700
@evenhuis @joshmoore
split description up
d91c75d
@CFGrote @joshmoore
Fixing exception syntax.
b9593ae
@evenhuis @joshmoore
added command line download
26a755c
@CFGrote @joshmoore
iteritems() -> items(), properly raise exception.
ee3f5c7
@evenhuis @joshmoore
Added the csv scripts
027b1b8
@CFGrote @joshmoore
Unset hardcoded namespace
bac0c6a
@evenhuis @joshmoore
Add local download script
2dc3722
@CFGrote @joshmoore
Fixing Remover.
b109565
@evenhuis @joshmoore
fixed up mistake in writing csv file:
31c91ca 
-  keys were not ordered correctly in the header
@CFGrote @joshmoore
fix namespace.
176f96d
@evenhuis @joshmoore
added 5.2 version of script
0446d00
@CFGrote @joshmoore
'iteritems->items', 'Exception, ex -> Exception as ex' in all scripts…
d859db1 
…, add except: pass.
@evenhuis @joshmoore
Added example Parse_OMERO_Properties.py
ae3b418
@CFGrote @joshmoore
Fixing print statements -> function.
75cbc8a
This was referenced Jan 11, 2022
Closed
Closed
@will-moore
Copy link
Member

will-moore commented Jan 19, 2022

Thanks @joshmoore.
This good to merge too now?

@will-moore will-moore mentioned this pull request Jan 19, 2022
Merged
@joshmoore
Copy link
Member Author

joshmoore commented Jan 21, 2022

Yup. Merging and I'll look into enabling CODEOWNERS. Everyone can help to remind me to get this into the release notes, and do the social media 🎉

Thanks, @evenhuis and @CFGrote, and welcome to the repo! 🙂

@joshmoore joshmoore merged commit fcffdf0 into ome:develop Jan 21, 2022
@joshmoore joshmoore deleted the ometa-squashed branch January 21, 2022 08:04
joshmoore added a commit to joshmoore/omero-scripts that referenced this pull request Feb 7, 2022
@joshmoore
CODEOWNERS for annotation_scripts
428c26f 
Follow on to ome#193 to allow @CFGrote to maintain the files
that were contributed to the central repository.
@joshmoore joshmoore mentioned this pull request Feb 7, 2022
Merged
@sbesson sbesson mentioned this pull request Apr 25, 2022
Merged
@will-moore will-moore mentioned this pull request Jun 14, 2022
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

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.

4 participants

@joshmoore @will-moore @evenhuis @CFGrote