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

Commit

Permalink
Gh 981: integrate fishbowl into gafferpy (#1015)
Browse files Browse the repository at this point in the history
* gh-981: Cleanup gafferpy

* gh-981: Format readme

* Revert "gh-981: Format readme"

This reverts commit 3e8c48c.

* gh-981: Rework how different client libraries are used

* gh-981: Tidy up warning

* gh-981: Fix tests

* gh-981: Moved fishbowl under gafferpy, works with the gafferpy connector

* gh-981: Make json return optional

* gh-981: Operations are generated and tested

* gh-981: Binary operators added

* Added generated functions

* Add generated predicates

* Fishbowl will make required args actually required

* Fix GetElements Op with helper

* Disable test when not using spring-rest api

* Generate config paths

* Cleanup paths and modules

* Bugfix config and cleanup

* Add licenses to fishbowl and add generated notice

* Change fishbowl README

* Cleanup README

* Backwards compatibility for imports

* Cleanup docstrings

* Refactor to use **kwargs

* Use core-rest endpoint so tests can pass

* Fixed bug with If operation extension

* Added comments where generated code imported

* Remove SeedMatching

* Update READMEs

* Fixed whitespace

* Added temp fix for missing function endpoints

* Added to init.py and corrected uri

* Added some doc about spring-rest /version

* Added https test
  • Loading branch information
t92549 authored Aug 16, 2022
1 parent 45f5fd1 commit 1831d46
Show file tree
Hide file tree
Showing 57 changed files with 6,415 additions and 6,515 deletions.
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

0 comments on commit 1831d46

Please sign in to comment.