Fix conda package upload (#59)

* Update build scripts

* Update readme

* Formatting

Author: mikeheddes

.github/workflows/publish.yml

@@ -31,6 +31,7 @@ jobs:
 
   anaconda:
     runs-on: ubuntu-latest
+    needs: pypi
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python
@@ -43,19 +44,23 @@ jobs:
         echo $CONDA/bin >> $GITHUB_PATH
     - name: Install dependencies
       run: |
+        sudo apt-get update && sudo apt-get install openssl curl
         conda install -y anaconda-client conda-build conda-verify
     - name: Publish distribution to Anaconda
       env:
         ANACONDA_API_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
       run: |
-        cd ./conda  # go to build dir
+        mkdir ./conda-build  # create the artifact dir
 
-        # Build for Linux
-        conda build --output-folder ./conda_build . .
+        # Get the version of the library
+        export TORCHHD_VERSION=$(python -c "with open('torchhd/version.py') as f: exec(f.read()); print(__version__)")
 
-        # Convert to other platforms: OSX, WIN
-        conda convert --platform all ./conda_build/linux-64/*.tar.bz2
+        # Calculate the HASH of the PyPi package
+        curl -L --output ./conda-build/torchhd.tar.gz "https://pypi.io/packages/source/t/torch-hd/torch-hd-${TORCHHD_VERSION}.tar.gz"
+        export TORCHHD_HASH=$(openssl sha256 ./conda-build/torchhd.tar.gz | awk '{print $2}')
 
-        anaconda upload --label main ./conda_build/osx-64/*.tar.bz2
-        anaconda upload --label main ./conda_build/linux-64/*.tar.bz2
-        anaconda upload --label main ./conda_build/win-64/*.tar.bz2
+        # Build for noarch platform
+        conda-build -c pytorch --output-folder ./conda-build ./conda
+
+        # Upload noarch version of torchhd to anaconda
+        anaconda upload -u torchhd --label main ./conda-build/*/*.tar.bz2

README.md

@@ -21,15 +21,15 @@ Torchhd is a Python library for Hyperdimensional Computing.
 
 ## Installation
 
-Torchhd is hosted on PyPi, use the following command to install:
+Torchhd is hosted on PyPi and Anaconda, use one of the following commands to install:
 
 ```bash
 pip install torch-hd
 ```
 
-<!-- ```bash
+```bash
 conda install -c torchhd torchhd
-``` -->
+```
 
 ## Documentation
 
@@ -105,7 +105,7 @@ To build the documentation locally, use `pip install -r docs/requirements.txt` t
 ### Creating a New Release
 
 - A GitHub release triggers a GitHub action that builds the library and publishes it to PyPi and Conda in addition to the documentation website.
-- Before creating a new GitHub release, increment the version number in [setup.py](https://github.com/hyperdimensional-computing/torchhd/blob/main/setup.py) using [semantic versioning](https://semver.org).
+- Before creating a new GitHub release, increment the version number in [version.py](https://github.com/hyperdimensional-computing/torchhd/blob/main/torchhd/version.py) using [semantic versioning](https://semver.org).
 - When creating a new GitHub release, set the tag according to [PEP 440](https://peps.python.org/pep-0440/), e.g., v1.5.2, and provide a clear description of the changes. You can use GitHub's "auto-generate release notes" button. Look at previous releases for examples.
 
 ### License

conda/conda_build_config.yaml

@@ -1,22 +1,22 @@
-{% set data = load_setup_py_data() %}
+{% set name = "torch-hd"  %}
 
 package:
   name: torchhd
-  version: {{ data['version'] }}
+  version: {{ TORCHHD_VERSION }}
 
 source:
-  path: ..
-  git_url: https://github.com/hyperdimensional-computing/torchhd
+  url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ TORCHHD_VERSION }}.tar.gz
+  sha256: {{ TORCHHD_HASH }}
 
 build:
+  noarch: generic
   number: 0
-  script: python setup.py install --single-version-externally-managed --record=record.txt
+  script: "{{ PYTHON }} -m pip install . --no-deps --ignore-installed -vv "
 
 requirements:
   host:
     - pip
     - python>=3.6
-
   run:
     - python>=3.6
     - pytorch
@@ -26,9 +26,15 @@ requirements:
 test:
   imports:
     - torchhd
+    - torchhd.functional
+    - torchhd.embeddings
+    - torchhd.structures
     - torchhd.datasets
 
 about:
-  home: {{ data['url'] }}
-  license: {{ data['license'] }}
-summary: {{ data['description'] }}
+  home: https://github.com/hyperdimensional-computing/torchhd
+  license: MIT
+  license_file: LICENSE
+  summary: Torchhd is a Python library for Hyperdimensional Computing
+  dev_url: https://github.com/hyperdimensional-computing/torchhd
+  doc_url: https://torchhd.readthedocs.io

conda/meta.yaml

@@ -5,9 +5,14 @@
 """
 from setuptools import setup, find_packages
 
+# Read the version without importing any dependencies
+version = {}
+with open("torchhd/version.py") as f:
+    exec(f.read(), version)
+
 setup(
     name="torch-hd",  # use torch-hd on PyPi to install torchhd, torchhd is too similar according to PyPi
-    version="2.2.2",
+    version=version["__version__"],
     description="Torchhd is a Python library for Hyperdimensional Computing",
     long_description=open("README.md").read(),
     long_description_content_type="text/markdown",

setup.py

@@ -13,6 +13,8 @@
     permute,
 )
 
+from torchhd.version import __version__
+
 __all__ = [
     "functional",
     "embeddings",

torchhd/__init__.py

@@ -0,0 +1 @@
+__version__ = "2.2.2"