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

Gh 981: integrate fishbowl into gafferpy #1015

Merged
merged 36 commits into from
Aug 16, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
65c038a
gh-981: Cleanup gafferpy
t92549 Jun 15, 2022
3e8c48c
gh-981: Format readme
t92549 Jun 15, 2022
ef98c16
Revert "gh-981: Format readme"
t92549 Jun 15, 2022
20f8efb
gh-981: Rework how different client libraries are used
t92549 Jun 17, 2022
d6fb9f7
gh-981: Tidy up warning
t92549 Jun 17, 2022
1ed4eee
gh-981: Fix tests
t92549 Jun 21, 2022
e46d75e
gh-981: Moved fishbowl under gafferpy, works with the gafferpy connector
t92549 Jun 22, 2022
2fb27e3
gh-981: Make json return optional
t92549 Jun 23, 2022
6c6ae9c
gh-981: Operations are generated and tested
t92549 Jun 27, 2022
77acde0
gh-981: Binary operators added
t92549 Jul 13, 2022
bde92b1
Merge branch 'v2-alpha' into gh-981-gafferpy-fishbowl-maintain
t92549 Jul 13, 2022
399bc1a
Added generated functions
t92549 Jul 20, 2022
2b20c94
Add generated predicates
t92549 Jul 20, 2022
13fc4df
Fishbowl will make required args actually required
t92549 Jul 21, 2022
2f76765
Fix GetElements Op with helper
t92549 Jul 21, 2022
f9131f0
Disable test when not using spring-rest api
t92549 Jul 21, 2022
708b6b3
Generate config paths
t92549 Jul 25, 2022
2eb5ff6
Cleanup paths and modules
t92549 Jul 25, 2022
b127f76
Bugfix config and cleanup
t92549 Jul 25, 2022
ab72d56
Add licenses to fishbowl and add generated notice
t92549 Jul 25, 2022
2b5aeba
Change fishbowl README
t92549 Jul 25, 2022
5be896a
Cleanup README
t92549 Jul 25, 2022
6c2af3a
Backwards compatibility for imports
t92549 Jul 26, 2022
0615358
Cleanup docstrings
t92549 Jul 26, 2022
26ab3b7
Refactor to use **kwargs
t92549 Jul 26, 2022
ee2b593
Use core-rest endpoint so tests can pass
t92549 Jul 26, 2022
6533102
Fixed bug with If operation extension
t92549 Jul 27, 2022
0394478
Added comments where generated code imported
t92549 Aug 3, 2022
bde4b33
Remove SeedMatching
t92549 Aug 3, 2022
f7adc78
Update READMEs
t92549 Aug 4, 2022
363002f
Fixed whitespace
t92549 Aug 8, 2022
ad1d75e
Added temp fix for missing function endpoints
t92549 Aug 11, 2022
71a3e46
Merge branch 'v2-alpha' into gh-981-gafferpy-fishbowl-maintain
t92549 Aug 12, 2022
41bb86c
Added to init.py and corrected uri
t92549 Aug 16, 2022
5bb622e
Added some doc about spring-rest /version
t92549 Aug 16, 2022
5c9600d
Added https test
t92549 Aug 16, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ __pycache__
.ipynb_checkpoints
*.ScriptBin
*.egg-info/
**/generated

# nohup
nohup.out
3 changes: 3 additions & 0 deletions cd/updateGafferVersion.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ sed -i'' "s/gaffer2:$oldVersion/gaffer2:$newVersion/g" NOTICES
sed -i'' "s/__version__ = \"$oldVersion\"/__version__ = \"$newVersion\"/g" python-shell/__init__.py
sed -i'' "s/__version__ = \"$oldVersion\"/__version__ = \"$newVersion\"/g" python-shell/src/__init__.py
sed -i'' "s/__version__ = \"$oldVersion\"/__version__ = \"$newVersion\"/g" python-shell/src/gafferpy/__init__.py
sed -i'' "s/__version__ = \"$oldVersion\"/__version__ = \"$newVersion\"/g" python-shell/src/fishbowl/__init__.py
sed -i'' "s/__version__ = \"$oldVersion\"/__version__ = \"$newVersion\"/g" python-shell/src/gafferpy_examples/__init__.py
sed -i'' "s/__version__ = \"$oldVersion\"/__version__ = \"$newVersion\"/g" python-shell/src/test/__init__.py

git add pom.xml
git add NOTICES
Expand Down
2 changes: 0 additions & 2 deletions fish-bowl/.gitignore

This file was deleted.

202 changes: 0 additions & 202 deletions fish-bowl/LICENCE

This file was deleted.

54 changes: 0 additions & 54 deletions fish-bowl/README.md

This file was deleted.

Empty file removed fish-bowl/fishbowl/__init__.py
Empty file.
108 changes: 0 additions & 108 deletions fish-bowl/fishbowl/connector.py

This file was deleted.

Loading