Merge branch 'main' into pit/pydantic_validation

Point72 · Aug 9, 2024 · 4f5505f · 4f5505f
2 parents 1a1b9a3 + cc77b7d
commit 4f5505f
Show file tree

Hide file tree

Showing 212 changed files with 9,694 additions and 4,546 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,7 +1,8 @@
 [bumpversion]
-current_version = 0.0.3
-commit = True
+current_version = 0.0.5
+commit = False
 tag = False
+commit_args = -s
 
 [bumpversion:file:csp/__init__.py]
 search = __version__ = "{current_version}"

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -2,17 +2,18 @@
 * @robambalu @AdamGlustein @svatasoiu @alexddobkin
 
 # Packaging code
-.bumpversion.cfg @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine @czgdp1807
-CMakeLists.txt @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine @czgdp1807
-Makefile @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine @czgdp1807
-MANIFEST.in @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine @czgdp1807
-pyproject.toml @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine @czgdp1807
-setup.py @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine @czgdp1807
-vcpkg.json @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine @czgdp1807
+.bumpversion.cfg @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine
+conda @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine
+CMakeLists.txt @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine
+Makefile @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine
+MANIFEST.in @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine
+pyproject.toml @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine
+setup.py @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine
+vcpkg.json @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine
 
 # CI/CD
-.github @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine @czgdp1807
-ci @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine @czgdp1807
+.github @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine
+ci @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine
 
 # Administrative
 .github/CODEOWNERS @robambalu

diff --git a/.github/actions/setup-caches/action.yml b/.github/actions/setup-caches/action.yml
@@ -2,16 +2,10 @@ name: Setup Caches
 description: 'Ensure various caches are setup like homebrew, vcpkg, ccache, etc'
 
 inputs:
-  cibuildwheel:
-    type: choice
-    description: "cibuildwheel run"
-    options:
-      - 'cp38'
-      - 'cp39'
-      - 'cp310'
-      - 'cp311'
-      - 'cp312'
-    default: 'cp39'
+  vcpkg:
+    type: boolean
+    description: "cache vcpkg assets"
+    default: true
 
 runs:
   using: 'composite'
@@ -38,7 +32,7 @@ runs:
         mkdir -p /home/runner/vcpkg_download_cache
         echo "VCPKG_DEFAULT_BINARY_CACHE=/home/runner/vcpkg_cache" >> $GITHUB_ENV
         echo "VCPKG_DOWNLOADS=/home/runner/vcpkg_download_cache" >> $GITHUB_ENV
-      if: ${{ runner.os == 'Linux' }}
+      if: ${{ runner.os == 'Linux' && inputs.vcpkg == 'true' }}
 
     - name: Setup vcpkg cache (Linux)
       uses: actions/cache@v4
@@ -48,7 +42,7 @@ runs:
           /home/runner/vcpkg_download_cache
         key: vcpkg-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('vcpkg.json') }}
         restore-keys: vcpkg-${{ runner.os }}-${{ runner.arch }}-
-      if: ${{ runner.os == 'Linux' }}
+      if: ${{ runner.os == 'Linux' && inputs.vcpkg == 'true' }}
 
     - name: Setup vcpkg cache in shell (macOS)
       shell: bash
@@ -57,7 +51,7 @@ runs:
         mkdir -p /Users/runner/vcpkg_download_cache
         echo "VCPKG_DEFAULT_BINARY_CACHE=/Users/runner/vcpkg_cache" >> $GITHUB_ENV
         echo "VCPKG_DOWNLOADS=/Users/runner/vcpkg_download_cache" >> $GITHUB_ENV
-      if: ${{ runner.os == 'macOS' }}
+      if: ${{ runner.os == 'macOS' && inputs.vcpkg == 'true' }}
 
     - name: Setup vcpkg cache (macOS)
       uses: actions/cache@v4
@@ -67,4 +61,23 @@ runs:
           /Users/runner/vcpkg_download_cache
         key: vcpkg-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('vcpkg.json') }}
         restore-keys: vcpkg-${{ runner.os }}-${{ runner.arch }}-
-      if: ${{ runner.os == 'macOS' }}
+      if: ${{ runner.os == 'macOS' && inputs.vcpkg == 'true'}}
+
+    - name: Setup vcpkg cache in shell (Windows)
+      shell: bash
+      run: |
+        mkdir C:\\Users\\runneradmin\\AppData\\Local\\vcpkg_cache
+        mkdir C:\\Users\\runneradmin\\AppData\\Local\\vcpkg_download_cache
+        echo "VCPKG_DEFAULT_BINARY_CACHE=C:\\Users\\runneradmin\\AppData\\Local\\vcpkg_cache" >> $GITHUB_ENV
+        echo "VCPKG_DOWNLOADS=C:\\Users\\runneradmin\\AppData\\Local\\vcpkg_download_cache" >> $GITHUB_ENV
+      if: ${{ runner.os == 'Windows' && inputs.vcpkg == 'true'}}
+
+    - name: Setup vcpkg cache (Windows)
+      uses: actions/cache@v4
+      with:
+        path: |
+          C:\\Users\\runneradmin\\AppData\\Local\\vcpkg_cache
+          C:\\Users\\runneradmin\\AppData\\Local\\vcpkg_download_cache
+        key: vcpkg-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('vcpkg.json') }}
+        restore-keys: vcpkg-${{ runner.os }}-${{ runner.arch }}-
+      if: ${{ runner.os == 'Windows' && inputs.vcpkg == 'true'}}
diff --git a/.github/actions/setup-dependencies/action.yml b/.github/actions/setup-dependencies/action.yml
@@ -22,7 +22,6 @@ runs:
     - name: Install python dependencies
       shell: bash
       run: make requirements
-      if: ${{ runner.os == 'Linux' }}
 
     ################
     # Linux # NOTE: skip for manylinux image
@@ -54,6 +53,6 @@ runs:
       shell: bash
       run: make dependencies-win
       env:
-        VCPKG_DEFAULT_TRIPLET: x64-windows
+        VCPKG_DEFAULT_TRIPLET: x64-windows-static-md
         VCPKG_PLATFORM_TOOLSET: v143
       if: ${{ runner.os == 'Windows' }}