Merge pull request #62 from oemof/revision/update_build_system

Update build system
oemof · Jun 27, 2024 · 760d0ec · 760d0ec
2 parents d495ee0 + 816e11a
commit 760d0ec
Show file tree

Hide file tree

Showing 15 changed files with 153 additions and 626 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
diff --git a/.cookiecutterrc b/.cookiecutterrc
diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml
@@ -26,9 +26,10 @@ jobs:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip setuptools setuptools_scm twine wheel
+        python -m pip install --upgrade pip
+        python -m pip install -e .[build]
     - name: Create packages
-      run: python setup.py sdist bdist_wheel
+      run: python -m build .
     - name: Run twine check
       run: twine check dist/*
     - uses: actions/upload-artifact@v4

diff --git a/.github/workflows/tox_checks.yml b/.github/workflows/tox_checks.yml
@@ -37,16 +37,15 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ matrix.toxenv }}-${{ hashFiles('tox.ini', 'setup.py') }}
+          key: ${{ runner.os }}-pip-${{ matrix.toxenv }}-${{ hashFiles('tox.ini', 'pyproject.toml') }}
           restore-keys: |
             ${{ runner.os }}-pip-${{ matrix.toxenv }}-
             ${{ runner.os }}-pip-
 
       - name: Install dependencies
         run: |
-          python -m pip install -U pip
-          python -m pip install -U setuptools wheel
-          python -m pip install -U tox
+          python -m pip install pip --upgrade
+          python -m pip install tox
 
       - name: Run ${{ matrix.toxenv }}
         run: python -m tox -e ${{ matrix.toxenv }}
diff --git a/.github/workflows/tox_pytests.yml b/.github/workflows/tox_pytests.yml
@@ -12,24 +12,22 @@ on:
     - cron: "0 5 * * 6"  # 5:00 UTC every Saturday
 
 jobs:
-  build:
+  pytest:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         python-version: ["3.9", "3.10", "3.11"]
 
     steps:
     - uses: actions/checkout@v4
-    - name: Install xmllint
-      run: sudo apt install coinor-cbc
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install tox tox-gh-actions coverage coveralls
+        python -m pip install tox tox-gh-actions coverage coveralls
     - name: Test with tox
       run: tox
 

diff --git a/MANIFEST.in b/MANIFEST.in
diff --git a/ci/bootstrap.py b/ci/bootstrap.py
diff --git a/ci/requirements.txt b/ci/requirements.txt
diff --git a/ci/templates/.appveyor.yml b/ci/templates/.appveyor.yml