🔁 Merge main branch

Signed-off-by: Pavithra Eswaramoorthy <[email protected]>

Author: pavithraes

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.0.1
+current_version = 0.0.2
 commit = True
 tag = False
 

.github/CODEOWNERS

@@ -0,0 +1,5 @@
+* @robambalu @AdamGlustein @svatasoiu @alexddobkin
+
+.github @robambalu @timkpaine @ngoldbaum @alexddobkin @AdamGlustein @svatasoiu
+.github/CODEOWNERS @robambalu
+

.github/workflows/build.yml

@@ -10,15 +10,15 @@ on:
       - LICENSE
       - NOTICE
       - README.md
-      - docs
+      - "docs/wiki/**"
   pull_request:
     branches:
       - main
     paths-ignore:
       - LICENSE
       - NOTICE
       - README.md
-      - docs
+      - "docs/wiki/**"
   workflow_dispatch:
     inputs:
       ci-full:
@@ -514,6 +514,8 @@ jobs:
 
       runs-on: ${{ matrix.os }}
 
+      if: ${{ needs.initialize.outputs.FULL_RUN == 'true' }}
+
       steps:
         - name: Checkout
           uses: actions/checkout@v4
@@ -542,7 +544,6 @@ jobs:
 
         # Install sdist
         - name: Install sdist
-          if: ${{ needs.initialize.outputs.FULL_RUN == 'true' }}
           run: python -m pip install -U -vvv dist/csp*.tar.gz --target .
           env:
             CCACHE_DIR: /home/runner/work/csp/csp/.ccache
@@ -551,7 +552,6 @@ jobs:
 
         # Test sdist
         - name: Run tests against from-scratch sdist build
-          if: ${{ needs.initialize.outputs.FULL_RUN == 'true' }}
           run: make test
           env:
             CSP_TEST_SKIP_EXAMPLES: "1"
@@ -585,7 +585,7 @@ jobs:
             - "sqlalchemy>=2"
             - "sqlalchemy<2"
             - "numpy==1.19.5"
-            
+
       runs-on: ${{ matrix.os }}
 
       steps:
@@ -666,7 +666,7 @@ jobs:
           run: ls -R ./dist
 
         - name: Publish to github releases
-          uses: softprops/action-gh-release@v1
+          uses: softprops/action-gh-release@v2
           with:
             draft: true
             generate_release_notes: true

.github/workflows/conda.yml

@@ -0,0 +1,61 @@
+name: Conda End-to-end Test
+
+on:
+  push:
+    branches:
+      - main
+    paths-ignore:
+      - LICENSE
+      - NOTICE
+      - README.md
+      - "docs/wiki/**"
+  pull_request:
+    branches:
+      - main
+    paths-ignore:
+      - LICENSE
+      - NOTICE
+      - README.md
+      - "docs/wiki/**"
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+permissions:
+  contents: write
+  checks: write
+
+jobs:
+    build:
+      runs-on: ubuntu-22.04
+      steps:
+        - name: Checkout
+          uses: actions/checkout@v4
+
+        - uses: mamba-org/setup-micromamba@v1
+          with:
+            micromamba-version: '1.5.7-0'
+            environment-file: conda/dev-environment-linux.yml
+            init-shell: >-
+              bash
+            cache-environment: true
+            post-cleanup: 'all'
+
+        - name: Set up Caches
+          uses: ./.github/actions/setup-caches
+          with:
+            cibuildwheel: 'cp311'
+
+        - name: Python Lint Steps (Linux)
+          run: make lint
+          shell: micromamba-shell {0}
+
+        - name: Python Build Steps (Linux)
+          run: make build-conda
+          shell: micromamba-shell {0}
+
+        - name: Python Test Steps (Linux)
+          run: make test
+          shell: micromamba-shell {0}

.github/workflows/publish_wiki.yml renamed to .github/workflows/wiki.yml

@@ -19,7 +19,9 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - name: Checkout
+        uses: actions/checkout@v4
+
       - name: Upload Documentation to Wiki
         uses: Andrew-Chen-Wang/github-wiki-action@v4
         with:

CMakeLists.txt

@@ -2,7 +2,7 @@
 # Project Configuration #
 #########################
 cmake_minimum_required(VERSION 3.20.0)
-project(csp VERSION "0.0.1")
+project(csp VERSION "0.0.2")
 set(CMAKE_CXX_STANDARD 17)
 
 ###################################################################################################################################################

MANIFEST.in

@@ -1,6 +1,6 @@
 # Text files
 include LICENSE
-include NOTICE 
+include NOTICE
 include README.md
 
 # Python files
@@ -22,6 +22,7 @@ prune .git
 prune .github
 prune .vscode
 prune ci
+prune conda
 prune examples
 exclude .clang-format
 exclude .gitattributes

Makefile

@@ -11,7 +11,7 @@ endif
 #########
 # BUILD #
 #########
-.PHONY: develop build-py build install
+.PHONY: requirements develop build build-conda install
 
 requirements:  ## install python dev and runtime dependencies
 	python -m pip install toml
@@ -21,10 +21,11 @@ requirements:  ## install python dev and runtime dependencies
 develop: requirements  ## install dependencies and build library
 	python -m pip install -e .[develop]
 
-build-py:  ## build the python library
+build:  ## build the library
 	python setup.py build build_ext --inplace -- -- -j$(NPROC)
 
-build: build-py  ## build the library
+build-conda:  ## build the library in Conda
+	CSP_USE_VCPKG=0 python setup.py build build_ext --inplace -- -- -j$(NPROC)
 
 install:  ## install library
 	python -m pip install .

dev-environment.yml renamed to conda/dev-environment-linux.yml

@@ -3,38 +3,47 @@ channels:
   - conda-forge
   - nodefaults
 dependencies:
+ - bison
+ - brotli
+ - bump2version>=1
+ - cmake
+ - codespell
  - compilers
  - cyrus-sasl
+ - exprtk
  - flex
- - cmake
- - ninja
- - bison
- - tar
- - unzip
- - zip
- - numpy
- - pyarrow>=7.0.0
- - ruamel.yaml
- - scikit-build
- - psutil
- - sqlalchemy
- - bump2version>=1.0.0
  - python-graphviz
  - httpx
  - isort
- - ruff
- - twine
- - wheel
+ - libarrow=15
+ - librdkafka
+ - lz4-c
+ - mamba
+ - mdformat
+ - ninja
+ - numpy
+ - psutil
+ - pyarrow=15
  - pandas
+ - pillow
  - polars
  - pytz
  - pytest
  - pytest-cov
  - pytest-sugar
  - pytest-asyncio
  - python<3.12
- - tornado
  - python-rapidjson
- - pillow
- - mdformat
- - codespell
+ - rapidjson
+ - requests
+ - ruamel.yaml
+ - ruff
+ - scikit-build
+ - slack-sdk
+ - sqlalchemy
+ - tar
+ - tornado
+ - twine
+ - unzip
+ - wheel
+ - zip

cpp/cmake/modules/FindBrotli.cmake

@@ -49,17 +49,17 @@ find_path( BROTLI_INCLUDE_DIR
   message("Include: ${BROTLI_INCLUDE_DIR}")
 
 find_library( BROTLI_STATIC_LIB_ENC
-  NAMES libbrotlienc.a libbrotlienc-static.a
+  NAMES libbrotlienc.a libbrotlienc-static.a brotlienc
   PATHS ${_brotli_roots}
   PATH_SUFFIXES "" "lib" )
 
 find_library( BROTLI_STATIC_LIB_DEC
-  NAMES libbrotlidec.a libbrotlidec-static.a
+  NAMES libbrotlidec.a libbrotlidec-static.a brotlidec
   PATHS ${_brotli_roots}
   PATH_SUFFIXES "" "lib" )
 
 find_library( BROTLI_STATIC_LIB_COMMON
-  NAMES libbrotlicommon.a libbrotlicommon-static.a
+  NAMES libbrotlicommon.a libbrotlicommon-static.a brotlicommon
   PATHS ${_brotli_roots}
   PATH_SUFFIXES "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib" )
 
@@ -101,4 +101,4 @@ mark_as_advanced(
   BROTLI_LIBS
   BROTLI_LIBRARIES
   BROTLI_STATIC_LIB
-)
+)