pinning numpy<2 (#230)

* pinning numpy<2 * added recent pythons to build matrix * going with ruff for linting/formatting etc
raphael-group · Oct 15, 2024 · 7115c38 · 7115c38
1 parent 7830580
commit 7115c38
Show file tree

Hide file tree

Showing 46 changed files with 6,072 additions and 4,641 deletions.
diff --git a/.flake8 b/.flake8
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -12,14 +12,25 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python: [3.7, 3.8, 3.9]
+        python: ["3.8", "3.9", "3.10", "3.11", "3.12"]
       fail-fast: false
 
     steps:
+      - name: Install system depedencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install libbz2-dev liblzma-dev
+        if: ${{ runner.os == 'Linux' }}
+
       - uses: actions/checkout@v2
         with:
           lfs: true
 
+      - name: Setup Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python }}
+
       - name: Upgrade setuptools
         run: |
           pip3 install wheel --upgrade
@@ -39,11 +50,6 @@ jobs:
           echo "GRB_LICENSE_FILE=${GUROBI_HOME}/gurobi.lic" >> $GITHUB_ENV
         continue-on-error: true
 
-      - name: Setup Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.python }}
-
       - name: Install HATCHet with dev dependencies
         run: |
           python -m pip install .[dev]
@@ -147,9 +153,9 @@ jobs:
           find tests/out -name "*:*" -exec rename 's|:|-|g' {} \;
 
       - name: Save Pytest Output Data
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
-          name: test-results
+          name: test-results-${{ matrix.python }}
           path: tests/out
 
       - name: Convert coverage
@@ -174,6 +180,11 @@ jobs:
         with:
           lfs: true
 
+      - name: Setup Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python }}
+
       - name: Upgrade setuptools
         run: |
           pip3 install wheel --upgrade
@@ -187,11 +198,6 @@ jobs:
           (cd gurobi902/linux64/lib && ln -f -s ../src/build/libgurobi_c++.a libgurobi_c++.a)
           echo "GUROBI_HOME=$(realpath gurobi902)" >> $GITHUB_ENV
 
-      - name: Setup Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.python }}
-
       - name: Install package
         run: |
           CXXFLAGS=-pthread pip install .[dev]

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,25 +1,9 @@
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
--   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.2.0
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.6.9
     hooks:
-    -   id: trailing-whitespace
-    -   id: end-of-file-fixer
-    -   id: check-yaml
-
--   repo: https://github.com/pycqa/flake8
-    rev: '4.0.1'
-    hooks:
-    -   id: flake8
-
--   repo: https://github.com/grantjenks/blue.git
-    rev: v0.9.1
-    hooks:
-    -   id: blue
-        args: [--line-length=120]
-
--   repo: https://github.com/MarcoGorelli/absolufy-imports
-    rev: v0.3.1
-    hooks:
-    -   id: absolufy-imports
+      - id: ruff
+        args: [ --fix ]
+      - id: ruff-format