Skip to content

Commit

Permalink
Remove show_deps.py in favor of pip-tools
Browse files Browse the repository at this point in the history
  • Loading branch information
JCGoran committed Feb 19, 2024
1 parent 51f7610 commit 8d67f69
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 130 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ concurrency:

on:
push:
branches:
branches:
- master
- live-debug*
- release/**
Expand Down Expand Up @@ -41,12 +41,12 @@ jobs:
python-version: ${{ env.PYTHON_VERSION }}
- uses: actions/checkout@v4
with:
fetch-depth: 2
fetch-depth: 2
- name: Install Python3 dependencies
working-directory: ${{runner.workspace}}/nmodl
run: |
pip3 install -U pip setuptools
pip3 install --user -r <(packaging/show_deps.py -b -r .)
pip3 install -U pip setuptools 'pip-tools>=7.4.0'
pip3 install --user -r <(pip-compile --all-build-deps --all-extras --no-strip-extras 2>&1)
- name: Restore compiler cache
uses: actions/cache@v4
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/nmodl-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ jobs:
- name: Install Python3 dependencies
working-directory: ${{runner.workspace}}/nmodl
run: |
python3 -m pip install -U pip setuptools
python3 -m pip install --user -r <(packaging/show_deps.py -b -r .)
python3 -m pip install -U pip setuptools 'pip-tools>=7.4.0'
python3 -m pip install --user -r <(pip-compile --all-build-deps --all-extras --no-strip-extras 2>&1)
- name: Install neuron-nightly
if: ${{matrix.config.enable_usecases == 'On'}}
Expand Down Expand Up @@ -190,7 +190,7 @@ jobs:
path: ${{runner.workspace}}/nmodl/build/Testing/*/Test.xml

# This step will set up an SSH connection on tmate.io for live debugging.
# To enable it, you have to:
# To enable it, you have to:
# * add 'live-debug-tests' to your PR title
# * push something to your PR branch (note that just re-running disregards the title update)
- name: live debug session on failure (manual steps required, check `nmodl-ci.yml`)
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/nmodl-doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ concurrency:

on:
push:
branches:
branches:
- master
- release/**
pull_request:
Expand Down Expand Up @@ -37,7 +37,7 @@ jobs:
uses: jwlawson/actions-setup-cmake@v1
with:
cmake-version: ${{ env.DESIRED_CMAKE_VERSION }}

- name: Install apt packages
run: |
sudo apt-get update
Expand All @@ -58,8 +58,8 @@ jobs:
- name: Install Python3 dependencies
working-directory: ${{runner.workspace}}/nmodl
run: |
pip3 install -U pip setuptools
pip3 install --user -r <(packaging/show_deps.py -r -b .)
pip3 install -U pip setuptools 'pip-tools>=7.4.0'
pip3 install --user -r <(pip-compile --all-build-deps --all-extras --no-strip-extras 2>&1)
# This step will set up an SSH connection on tmate.io for live debugging.
# To trigger it, simply add 'live-debug-docs' to your last pushed commit message.
Expand All @@ -77,7 +77,7 @@ jobs:
docs-${{github.ref}}-
docs-
- name: Documentation
- name: Documentation
id: documentation
working-directory: ${{runner.workspace}}/nmodl
run: |
Expand All @@ -93,7 +93,7 @@ jobs:
echo "status=done" >> $GITHUB_OUTPUT
env:
CCACHE_DIR: ${{runner.workspace}}/ccache

- name: Deploy 🚀
uses: JamesIves/github-pages-deploy-action@v4
if: steps.documentation.outputs.status == 'done' && startsWith(github.ref, 'refs/heads/master')
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sonarsource.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ jobs:
- name: Install Python3 dependencies
working-directory: ${{runner.workspace}}/nmodl
run: |
pip3 install -U pip setuptools
pip3 install --user -r <(packaging/show_deps.py -r -b .)
pip3 install -U pip setuptools 'pip-tools>=7.4.0'
pip3 install --user -r <(pip-compile --all-build-deps --all-extras --no-strip-extras 2>&1)
- name: Install sonar-scanner and build-wrapper
uses: SonarSource/sonarcloud-github-c-cpp@v2
- name: Configure project
Expand Down
6 changes: 3 additions & 3 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ stages:
sudo apt-get install -y g++-9 flex bison libfl-dev cython libx11-dev libxcomposite-dev libncurses-dev mpich
sudo apt-get install -y python3.8 python3.8-dev python3.8-venv ninja-build
sudo apt-get remove -y python3-importlib-metadata
python3.8 -m pip install --upgrade pip setuptools
python3.8 -m pip install --user -r <($(Build.Repository.LocalPath)/packaging/show_deps.py -r -b $(Build.Repository.LocalPath))
python3.8 -m pip install --upgrade pip setuptools 'pip-tools>=7.4.0'
python3.8 -m pip install --user -r <(pip-compile --all-build-deps --all-extras --no-strip-extras 2>&1)
# we manually get version 3.15.0 to make sure that changes in the cmake
# files do not require unsupported versions of cmake in our package.
wget --quiet --output-document=- "https://github.com/Kitware/CMake/releases/download/$CMAKE_VER/$CMAKE_PKG.tar.gz" | tar xzpf -
Expand Down Expand Up @@ -149,7 +149,7 @@ stages:
- script: |
brew install flex bison cmake python@3
python3 -m pip install --upgrade pip setuptools
python3 -m pip install --user -r <($(Build.Repository.LocalPath)/packaging/show_deps.py -r -b $(Build.Repository.LocalPath))
python3 -m pip install --user -r <(pip-compile --all-build-deps --all-extras --no-strip-extras 2>&1)
displayName: 'Install Dependencies'
- script: |
export PATH=/usr/local/opt/flex/bin:/usr/local/opt/bison/bin:$PATH;
Expand Down
112 changes: 0 additions & 112 deletions packaging/show_deps.py

This file was deleted.

0 comments on commit 8d67f69

Please sign in to comment.