Skip to content

Commit

Permalink
Merge branch 'develop' into new_monitoring_service
Browse files Browse the repository at this point in the history
  • Loading branch information
mesmith75 committed Jan 10, 2024
2 parents 160de44 + 63b6575 commit 69ff4a0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/ci_push_testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:

- name: Get changed files
id: changed-files
uses: tj-actions/changed-files@v40.2.0
uses: tj-actions/changed-files@v41.0.0
with:
base_sha: ${{ github.event.pull_request.head.sha }}

Expand Down Expand Up @@ -320,8 +320,10 @@ jobs:
run: |
/cvmfs/sft.cern.ch/lcg/releases/LCG_100/Python/3.8.6/x86_64-centos7-gcc9-opt/bin/python3 -m venv ~/venv
. ~/venv/bin/activate
yum install -y glibc-devel
export CC=/cvmfs/sft.cern.ch/lcg/releases/gcc/7.3.0/x86_64-centos7/bin/gcc
python3 -m pip install --upgrade pip setuptools wheel
python3 -m pip install -e .[dev,LHCb]
python3 -m pip install -e .[dev,LHCb,Dirac]
- name: Test with pytest
run: |
. ~/venv/bin/activate
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ def run(self):
'pytest-pylint',
'pytest-mock'],
'profiler': ['memory_profiler'],
'Dirac': ['UltraDict'],
'LHCb': ['LbDevTools']},
'LHCb': ['LbDevTools'],
'Dirac': ['UltraDict']},
classifiers=[
'License :: OSI Approved :: GNU General Public License v2 (GPLv2)',
'Programming Language :: Python :: 3.8',
Expand Down

0 comments on commit 69ff4a0

Please sign in to comment.