Skip to content

Commit

Permalink
Revert "Merge pull request #5 from JasonWildMe/migrate_to_whaleridgef…
Browse files Browse the repository at this point in the history
…indr"

This reverts commit dfcf0df, reversing
changes made to 479114e.
  • Loading branch information
holmbergius committed Aug 23, 2023
1 parent dfcf0df commit a1b10b8
Show file tree
Hide file tree
Showing 12 changed files with 157 additions and 157 deletions.
24 changes: 12 additions & 12 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
===========================
Wildbook IA - wbia_whaleridgefindr
Wildbook IA - wbia_finfindr
===========================

|Build| |Pypi| |ReadTheDocs|

whaleridgefindr Plug-in - Part of the WildMe / Wildbook IA Project.
FinFindR Plug-in - Part of the WildMe / Wildbook IA Project.

A plug-in for using the containerized version of the `whaleridgefindr gray whale ID algorithm <https://github.com/haimeh/finFindR>`_.
A plug-in for using the containerized version of the `finFindR dolphin ID algorithm <https://github.com/haimeh/finFindR>`_.

Running the whaleridgefindr Container
Running the finFindR Container
------------------------------
This plugin assumes that:

1. You have separately started the whaleridgefindr container with the command:
1. You have separately started the finFindR container with the command:

.. code:: bash
docker run -p 8004:8004/tcp --name flukebook_whaleridgefindr --network flukebook haimeh/whaleridgefindr:latest
docker run -p 8004:8004/tcp --name flukebook_finfindr --network flukebook wildme/wbia-plugin-finfindr:1.8.3
2. Your WBIA container also has the same network ("flukebook" above) defined for it.

Expand Down Expand Up @@ -76,14 +76,14 @@ Our code uses Google-style documentation tests (doctests) that uses pytest and x
pytest
.. |Build| image:: https://img.shields.io/github/workflow/status/WildMeOrg/wbia-plugin-whaleridgefindr/Build%20and%20upload%20to%20PyPI/main
:target: https://github.com/WildMeOrg/wbia-plugin-whaleridgefindr/actions?query=branch%3Amain+workflow%3A%22Build+and+upload+to+PyPI%22
.. |Build| image:: https://img.shields.io/github/workflow/status/WildMeOrg/wbia-plugin-finfindr/Build%20and%20upload%20to%20PyPI/main
:target: https://github.com/WildMeOrg/wbia-plugin-finfindr/actions?query=branch%3Amain+workflow%3A%22Build+and+upload+to+PyPI%22
:alt: Build and upload to PyPI (main)

.. |Pypi| image:: https://img.shields.io/pypi/v/wbia-whaleridgefindr.svg
:target: https://pypi.python.org/pypi/wbia-whaleridgefindr
.. |Pypi| image:: https://img.shields.io/pypi/v/wbia-finfindr.svg
:target: https://pypi.python.org/pypi/wbia-finfindr
:alt: Latest PyPI version

.. |ReadTheDocs| image:: https://readthedocs.org/projects/wbia-plugin-whaleridgefindr/badge/?version=latest
:target: https://wbia-plugin-whaleridgefindr.readthedocs.io/en/latest/
.. |ReadTheDocs| image:: https://readthedocs.org/projects/wbia-plugin-finfindr/badge/?version=latest
:target: https://wbia-plugin-finfindr.readthedocs.io/en/latest/
:alt: Documentation on ReadTheDocs
Binary file added example-images/5412.a.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added example-images/5412.b.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added example-images/5412.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added example-images/ind1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added example-images/ind2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added example-images/ind3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added example-images/ind4.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added example-images/ind5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def native_mb_python_tag(plat_impl=None, version_info=None):
return mb_tag


def parse_version(fpath='wbia_whaleridgefindr/__init__.py'):
def parse_version(fpath='wbia_finfindr/__init__.py'):
"""
Statically parse the version number from a python file
Expand Down Expand Up @@ -169,7 +169,7 @@ def gen_packages_items():
return packages


NAME = 'wbia-whaleridgefindr'
NAME = 'wbia-finfindr'


MB_PYTHON_TAG = native_mb_python_tag() # NOQA
Expand All @@ -178,9 +178,9 @@ def gen_packages_items():
'Jason Parham',
]
AUTHOR_EMAIL = '[email protected]'
URL = 'https://github.com/WildbookOrg/wbia-plugin-whaleridgefindr'
URL = 'https://github.com/WildbookOrg/wbia-plugin-finfindr'
LICENSE = 'Apache Version 2.0'
DESCRIPTION = 'wbia_whaleridgefindr - A plug-in for the finFindR gray whale ID algorithm'
DESCRIPTION = 'wbia_finfindr - A plug-in for the finFindR dolphin ID algorithm'

KWARGS = OrderedDict(
name=NAME,
Expand All @@ -203,13 +203,13 @@ def gen_packages_items():
# See https://github.com/pypa/setuptools_scm/ for more information
setup_requires=['setuptools_scm'],
use_scm_version={
'write_to': 'wbia_whaleridgefindr/_version.py',
'write_to': 'wbia_finfindr/_version.py',
'write_to_template': '__version__ = "{version}"',
'tag_regex': '^(?P<prefix>v)?(?P<version>[^\\+]+)(?P<suffix>.*)?$',
'local_scheme': 'dirty-tag',
},
packages=find_packages(),
package_dir={'wbia_whaleridgefindr': 'wbia_whaleridgefindr'},
package_dir={'wbia_finfindr': 'wbia_finfindr'},
include_package_data=False,
# List of classifiers available at:
# https://pypi.python.org/pypi?%3Aaction=list_classifiers
Expand Down
4 changes: 2 additions & 2 deletions wbia_finfindr/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
try:
from wbia_whaleridgefindr._version import __version__
from wbia_finfindr._version import __version__
except ImportError:
__version__ = '0.0.0'

from wbia_whaleridgefindr import _plugin # NOQA
from wbia_finfindr import _plugin # NOQA
Loading

0 comments on commit a1b10b8

Please sign in to comment.