Merge pull request #499 from KhiopsML/497-updates-after-pypi-conda-forge-releases

Updates after pypi and conda-forge releases

Author: tramora

.github/workflows/conda.yml

@@ -14,11 +14,6 @@ on:
       khiops-samples-version:
         default: 11.0.0
         description: khiops-samples version
-      release-channel:
-        type: choice
-        default: khiops-dev
-        options: [khiops-dev, khiops]
-        description: Anaconda channel to release
   push:
     tags: ['*']
   pull_request:
@@ -223,8 +218,8 @@ jobs:
             tests.test_khiops_integrations.KhiopsRunnerEnvironmentTests.test_runner_environment_initialization
 
   # Release is only executed on tags
-  # Note: For this job to work the secrets variables KHIOPS_ANACONDA_CHANNEL_TOKEN and
-  #       KHIOPS_DEV_ANACONDA_CHANNEL_TOKEN must be set with valid anaconda.org access tokens
+  # Note: For this job to work the secret variable KHIOPS_DEV_ANACONDA_CHANNEL_TOKEN
+  #       must be set with a valid anaconda.org access token
   release:
     if: github.ref_type == 'tag'
     needs: test
@@ -268,16 +263,6 @@ jobs:
         run: python -m conda_index ./khiops-conda
       - name: Upload the Package to anaconda.org
         run: |-
-          # Set the anaconda.org channel
-          ANACONDA_CHANNEL="${{ inputs.release-channel || 'khiops-dev' }}"
-
-          # For the release channel: upload without forcing
-          if [[ "$ANACONDA_CHANNEL" == "khiops" ]]
-          then
-            anaconda --token "${{ secrets.KHIOPS_ANACONDA_CHANNEL_TOKEN }}" upload \
-              --user "$ANACONDA_CHANNEL" ./khiops-conda/noarch/*.conda
-          # For the dev channel: upload with forcing
-          else
-            anaconda --token "${{ secrets.KHIOPS_DEV_ANACONDA_CHANNEL_TOKEN }}" upload \
-              --user "$ANACONDA_CHANNEL" --force ./khiops-conda/noarch/*.conda
-          fi
+          # Override versions, as the packages are pushed to a dev channel          
+          anaconda --token "${{ secrets.KHIOPS_DEV_ANACONDA_CHANNEL_TOKEN }}" upload \
+            --user khiops-dev --force ./khiops-conda/noarch/*.conda

.github/workflows/dev-docker.yml

@@ -5,8 +5,8 @@ env:
   DEFAULT_IMAGE_INCREMENT: 0
   DEFAULT_SERVER_REVISION: main
   DEFAULT_PYTHON_VERSIONS: 3.8 3.9 3.10 3.11 3.12 3.13 3.14
-  DEFAULT_KHIOPS_GCS_DRIVER_REVISION: 0.0.11
-  DEFAULT_KHIOPS_S3_DRIVER_REVISION: 0.0.13
+  DEFAULT_KHIOPS_GCS_DRIVER_REVISION: 0.0.14
+  DEFAULT_KHIOPS_S3_DRIVER_REVISION: 0.0.14
 on:
   pull_request:
     paths: [packaging/docker/khiopspydev/Dockerfile.*, .github/workflows/dev-docker.yml]
@@ -38,11 +38,11 @@ on:
         description: Khiops Server Revision
       khiops-gcs-driver-revision:
         type: string
-        default: 0.0.11
+        default: 0.0.14
         description: Driver version for Google Cloud Storage remote files
       khiops-s3-driver-revision:
         type: string
-        default: 0.0.13
+        default: 0.0.14
         description: Driver version for AWS-S3 remote files
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}

README.md

@@ -13,10 +13,28 @@ in two ways:
 
 ## Installation
 
+Using `conda`
 ```bash
-conda install -c conda-forge -c khiops khiops
+conda create -n khiops-env
+conda activate khiops-env
+conda install -c conda-forge khiops
 ```
-Other install methods are documented at the [Khiops website][khiops-install].
+
+Using `pip` under Linux (in a `bash` shell)
+```bash
+python -m venv khiops-venv
+source khiops-venv/bin/activate
+pip install -U khiops
+```
+
+Using `pip` under Windows (in a `powershell` shell)
+```shell
+python -m venv khiops-venv
+khiops-venv\Scripts\activate
+pip install -U khiops
+```
+
+Other installation methods are documented at the [Khiops website][khiops-install].
 
 ### Requirements
 - [Python][python] (>=3.8)

doc/index.rst

@@ -6,11 +6,30 @@ Welcome to the Khiops Python API documentation page.
 
 Installation
 ------------
-Khiops is better installed with `conda package manager <https://docs.conda.io/en/latest/>`_
+Khiops can be installed with `conda package manager <https://docs.conda.io/en/latest/>`_
 
-.. code-block:: shell
+.. code-block:: bash
 
-    conda install -c conda-forge -c khiops khiops
+    conda create -n khiops-env
+    conda activate khiops-env
+    conda install -c conda-forge khiops
+
+Alternatively, you can install in a virtual environment using `pip`,
+under Linux (in a `bash` shell) :
+
+.. code-block:: bash
+
+    python -m venv khiops-venv
+    source khiops-venv/bin/activate
+    pip install -U khiops
+
+under Windows (in a `powershell` shell) :
+
+.. code-block:: powershell
+
+    python -m venv khiops-venv
+    khiops-venv\Scripts\activate
+    pip install -U khiops
 
 More details and other install methods are documented at the `Khiops website
 <https://www.khiops.org/setup>`_.

packaging/docker/khiopspydev/Dockerfile.ubuntu

@@ -67,7 +67,7 @@ RUN true \
         # khiops core \
         $CONDA install -y -n py${version}_conda ${RC_LABEL}khiops-core=$(echo ${KHIOPS_REVISION} | tr -d "-") ; \
         # remote files drivers installed in the conda environment \
-        $CONDA install -y -n py${version}_conda -c khiops \
+        $CONDA install -y -n py${version}_conda -c conda-forge \
         khiops-driver-s3=${KHIOPS_S3_DRIVER_REVISION} \
         khiops-driver-gcs=${KHIOPS_GCS_DRIVER_REVISION}; \
     done' \
@@ -83,7 +83,8 @@ RUN true \
     # Get Linux distribution codename \
     && if [ -f /etc/os-release ]; then . /etc/os-release; fi \
     && wget -O khiops-gcs.deb https://github.com/KhiopsML/khiopsdriver-gcs/releases/download/${KHIOPS_GCS_DRIVER_REVISION}/khiops-driver-gcs_${KHIOPS_GCS_DRIVER_REVISION}-1-${VERSION_CODENAME}.amd64.deb \
-    && wget -O khiops-s3.deb https://github.com/KhiopsML/khiopsdriver-s3/releases/download/${KHIOPS_S3_DRIVER_REVISION}/khiops-driver-s3_${KHIOPS_S3_DRIVER_REVISION}-1-${VERSION_CODENAME}.amd64.deb \
+    # A little typo in the artifact name for version 0.0.14 needs fixing that is why a hardcoded version is used here \
+    && wget -O khiops-s3.deb https://github.com/KhiopsML/khiopsdriver-s3/releases/download/${KHIOPS_S3_DRIVER_REVISION}/khiops-driver-s3_0.0.13-1-${VERSION_CODENAME}.amd64.deb \
     && (dpkg -i --force-all khiops-gcs.deb khiops-s3.deb || true) \
     && apt-get -f -y install \
     && rm -f khiops-gcs.deb khiops-s3.deb \