Build both the ib wheel and dhib wheel

.github/workflows/build-and-publish.yml

@@ -27,7 +27,7 @@ jobs:
         python3 --version
         python3 -m pip install --upgrade pip
         python3 -m pip install -r requirements_dhib_env.txt
-        python3 dhib_env.py ibwheel --ib_version ${{ env.IB_VERSION }}
+        python3 dhib_env.py ib-wheel --ib_version ${{ env.IB_VERSION }}
         find . -name \*.whl
     - name: Archive build artifacts
       uses: actions/upload-artifact@v2

dhib_env.py

@@ -338,6 +338,11 @@ def build(self, pyenv: Pyenv) -> None:
         shell_exec(f"cd build/ib/IBJts/source/pythonclient && {pyenv.python} -m build --wheel")
         shell_exec("cp build/ib/IBJts/source/pythonclient/dist/* dist/ib/")
 
+    @property
+    def path(self) -> Path:
+        """The path to the IB wheel."""
+        return Path(f"dist/ib/ibapi-{version_str(self.version, False)}-py3-none-any.whl").absolute()
+
     def install(self, pyenv: Pyenv) -> None:
         """Install the IB wheel into a virtual environment.
 
@@ -346,7 +351,7 @@ def install(self, pyenv: Pyenv) -> None:
         """
         logging.warning(f"Installing IB wheel in python environment: {self.version} python: {pyenv.python}")
         ver_narrow = version_str(self.version, False)
-        pyenv.pip_install(Path(f"dist/ib/ibapi-{ver_narrow}-py3-none-any.whl").absolute())
+        pyenv.pip_install(self.path)
 
 
 ########################################################################################################################
@@ -371,10 +376,15 @@ def build(self, pyenv: Pyenv) -> None:
         logging.warning(f"Building deephaven-ib: {self.version}")
         shell_exec(f"DH_IB_VERSION={self.version} DH_VERSION={self.dh_version} IB_VERSION={self.ib_version} {pyenv.python} -m build --wheel")
 
+    @property
+    def path(self) -> Path:
+        """The path to the deephaven-ib wheel."""
+        return Path(f"dist/deephaven_ib-{self.version}-py3-none-any.whl").absolute()
+
     def install(self, pyenv: Pyenv) -> None:
         """Install the deephaven-ib wheel into a virtual environment."""
         logging.warning(f"Installing deephaven-ib in python environment: {self.version} python: {pyenv.python}")
-        pyenv.pip_install(Path(f"dist/deephaven_ib-{self.version}-py3-none-any.whl").absolute())
+        pyenv.pip_install(self.path)
 
 
 ########################################################################################################################
@@ -410,27 +420,57 @@ def cli():
 @click.command()
 @click.option('--python', default="python3", help='The path to the Python executable to use.')
 @click.option('--ib_version', default=IB_VERSION_DEFAULT, help='The version of ibapi.')
-def ibwheel(
+def ib_wheel(
         python: str,
         ib_version: str,
 ):
-    """Create a development environment."""
+    """Create an ibapi wheel."""
     logging.warning(f"Creating an ib wheel: python={python}, ib_version={ib_version}")
 
-    python = Path(python).absolute() if python.startswith("./") else python
-
     version_assert_format(ib_version)
 
+    python = Path(python).absolute() if python.startswith("./") else python
     logging.warning(f"Using system python: {python}")
     pyenv = Pyenv(python)
 
     ib_wheel = IbWheel(ib_version)
     ib_wheel.build(pyenv)
 
     logging.warning(f"IB wheel created successfully.")
-    logging.warning(f"IB wheel path: {Path(f'dist/ib/ibapi-{ib_version}-py3-none-any.whl').absolute()}")
+    logging.warning(f"IB wheel path: {ib_wheel.path}")
 
-    success(pyenv)
+
+@click.command()
+@click.option('--python', default="python3", help='The path to the Python executable to use.')
+@click.option('--dh_version', default=DH_VERSION_DEFAULT, help='The version of Deephaven.')
+@click.option('--ib_version', default=IB_VERSION_DEFAULT, help='The version of ibapi.')
+@click.option('--dh_ib_version', default=None, help='The version of deephaven-ib.')
+def dhib_wheel(
+        python: str,
+        dh_version: str,
+        ib_version: str,
+        dh_ib_version: Optional[str],
+):
+    """Create a deephaven-ib wheel."""
+    logging.warning(f"Creating a deephaven-ib wheel: python={python}, ib_version={ib_version} dh_version={dh_version}, dh_ib_version={dh_ib_version}")
+
+    if dh_ib_version is None:
+        dh_ib_version = "0.0.0.dev0"
+
+    version_assert_format(ib_version)
+    version_assert_format(dh_version)
+    version_assert_format(dh_ib_version)
+
+    python = Path(python).absolute() if python.startswith("./") else python
+    logging.warning(f"Using system python: {python}")
+    pyenv = Pyenv(python)
+
+    logging.warning(f"Building deephaven-ib from source: {dh_ib_version}")
+    dh_ib_wheel = DhIbWheel(dh_ib_version, dh_version, ib_version)
+    dh_ib_wheel.build(pyenv)
+
+    logging.warning(f"Deephaven-ib wheel created successfully.")
+    logging.warning(f"Deephaven-ib wheel path: {dh_ib_wheel.path}")
 
 
 @click.command()
@@ -570,7 +610,8 @@ def release(
     success(pyenv)
 
 
-cli.add_command(ibwheel)
+cli.add_command(ib_wheel)
+cli.add_command(dhib_wheel)
 cli.add_command(dev)
 cli.add_command(release)