Merge pull request #192 from radical-cybertools/fix/deps_version

set version requirement for RCT stack
radical-cybertools · May 9, 2024 · 7d6599d · 7d6599d
2 parents d91d2a5 + 6a8a896
commit 7d6599d
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 33 deletions.
diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml
@@ -30,26 +30,20 @@ jobs:
       run: |
         python -m venv testenv
         . testenv/bin/activate
-        python -m pip install --upgrade pip setuptools
-        python -m pip install --upgrade .
-        python -m pip install git+https://github.com/radical-cybertools/radical.entk.git@devel
-        python -m pip install git+https://github.com/radical-cybertools/radical.pilot.git@devel
-        python -m pip install git+https://github.com/radical-cybertools/radical.saga.git@devel
-        python -m pip install git+https://github.com/radical-cybertools/radical.utils.git@devel
-        python -m pip install psutil
-        python -m pip install coverage codecov
-        python -m pip install pytest pytest-timeout
+        python -m pip install --upgrade pip setuptools wheel
+        python -m pip install -r requirements-ci.txt
     - name: Test with pytest
       env:
         LOC: testenv/lib/python3.7/site-packages
       run: |
         . testenv/bin/activate
         coverage run --include=$LOC/radical/analytics/* -m pytest -ra --timeout=600 -vvv --showlocals tests/
         coverage xml
-    - name: Codecov
-      uses: codecov/codecov-action@v1
+    - uses: codecov/codecov-action@v3
+      env:
+        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
       with:
-        file: ./coverage.xml
+        files: ./coverage.xml
 
   linting:
     runs-on: ubuntu-latest
@@ -65,18 +59,12 @@ jobs:
       run: |
         python -m venv testenv
         . testenv/bin/activate
-        python -m pip install --upgrade pip setuptools
-        python -m pip install git+https://github.com/radical-cybertools/radical.entk.git@devel
-        python -m pip install git+https://github.com/radical-cybertools/radical.pilot.git@devel
-        python -m pip install git+https://github.com/radical-cybertools/radical.saga.git@devel
-        python -m pip install git+https://github.com/radical-cybertools/radical.utils.git@devel
-        python -m pip install --upgrade .
-        python -m pip install flake8 flake8-per-file-ignores
-        python -m pip install pytest pylint
+        python -m pip install --upgrade pip setuptools wheel
+        python -m pip install -r requirements-ci.txt
     - name: Lint with flake8 and pylint
       run: |
         . testenv/bin/activate
-        LOG=`git log -n 1 | grep Merge || true`
+        LOG=`git log -n 1 | grep Merge || echo 'no merging' && exit 0`
         NEW=`echo $LOG | cut -d ' ' -f2`
         OLD=`echo $LOG | cut -d ' ' -f3`
         test -z "$NEW" && NEW=HEAD

diff --git a/requirements-ci.txt b/requirements-ci.txt
@@ -0,0 +1,24 @@
+
+# provided branches for RCT components can be edited,
+# if there is a dependency with non-devel branch
+
+# default RCT branch for CI runs is "devel"
+
+radical.utils @ git+https://github.com/radical-cybertools/radical.utils.git@devel
+radical.gtod @ git+https://github.com/radical-cybertools/radical.gtod.git@devel
+radical.pilot @ git+https://github.com/radical-cybertools/radical.pilot.git@devel
+radical.entk @ git+https://github.com/radical-cybertools/radical.entk.git@devel
+
+# RA from the current branch
+.
+
+pytest
+pytest-timeout
+pylint
+flake8
+flake8-per-file-ignores
+coverage
+mock==2.0.0.
+psutil
+pudb
+
diff --git a/requirements-tests.txt b/requirements-tests.txt
diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,7 @@
-radical.utils
+radical.utils>=1.53
 matplotlib
 psutil
 pandas
 numpy
 sqlalchemy
-more_itertools
+more_itertools