Disable packages living on decomissioned svn server

.github/workflows/python_unittests.yml

@@ -10,8 +10,8 @@ jobs:
       matrix:
         py_version: ['2.7.x', '3.7']
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-python@v2
+    - uses: actions/checkout@v3
+    - uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.py_version }}
     - name: Install requirements

ilcsoft/cernlib.py

@@ -183,7 +183,7 @@ def cleanupInstall(self):
         #os.chdir( self.installPath + "/build" )
 
         ## delete object files
-        os_system( "find "+self.installPath + "/build -type f -name *.o -exec rm -f {} \;" )
+        os_system( "find "+self.installPath + r"/build -type f -name *.o -exec rm -f {} \;" )
 
     def postCheckDeps(self):
         BaseILC.postCheckDeps(self)

ilcsoft/ilcsoft.py

@@ -80,7 +80,7 @@ def __init__(self, installPath):
         #fg: release_string might be empty, e.g. if lsb_release does not exis (MacOs)
         self.release_number = '-1'
         if len( release_string ): 
-            self.release_number = release_string[re.search('\d', release_string).start()]
+            self.release_number = release_string[re.search(r'\d', release_string).start()]
 
         for k,v in self.debugInfo.items():
             print("+", k, '\t', str(v).replace("\n","\n\t\t"))

ilcsoft/ninja.py

@@ -54,7 +54,7 @@ def compile(self):
     def cleanupInstall(self):
         BaseILC.cleanupInstall(self)
         os.chdir( self.installPath )
-        os_system( "find . \! -name 'ninja' -delete" )
+        os_system( r"find . \! -name 'ninja' -delete" )
 
     def postCheckDeps(self):
         BaseILC.postCheckDeps(self)

ilcsoft/test_version.py

@@ -3,30 +3,30 @@
 ################################################
 
 from .version import Version
-import py
+import pytest
 
 def test_sanity():
-    py.test.raises(TypeError, Version )
-    py.test.raises(ValueError, Version, 0)
-    py.test.raises(ValueError, Version, [])
-    py.test.raises(ValueError, Version, '')
-    py.test.raises(ValueError, Version, '1')
-    py.test.raises(ValueError, Version, '1.')
-    py.test.raises(ValueError, Version, 'a.b')
-    py.test.raises(ValueError, Version, 'blah')
+    pytest.raises(TypeError, Version )
+    pytest.raises(ValueError, Version, 0)
+    pytest.raises(ValueError, Version, [])
+    pytest.raises(ValueError, Version, '')
+    pytest.raises(ValueError, Version, '1')
+    pytest.raises(ValueError, Version, '1.')
+    pytest.raises(ValueError, Version, 'a.b')
+    pytest.raises(ValueError, Version, 'blah')
 
 def test_general():
 
     MIN_ELEM = Version._min_elements
 
     # versions must have at least one element > 0
-    py.test.raises(ValueError, Version, MIN_ELEM * (0,) )
+    pytest.raises(ValueError, Version, MIN_ELEM * (0,) )
 
     # elements must be integers or convertible to int
-    py.test.raises(ValueError, Version, (MIN_ELEM * [1]) + ['a'] )
+    pytest.raises(ValueError, Version, (MIN_ELEM * [1]) + ['a'] )
 
     # elements must be >= 0
-    py.test.raises(ValueError, Version, (MIN_ELEM * [1]) + [-1] )
+    pytest.raises(ValueError, Version, (MIN_ELEM * [1]) + [-1] )
 
     # cutting off / filling missing elements
     MAX_ELEM = 4

releases/HEAD/release-ilcsoft.cfg

@@ -202,16 +202,16 @@ ilcsoft.module("LICH").addDependency( [ 'LCIO', 'ROOT', 'Marlin', 'MarlinUtil' ]
 #ilcsoft.module("Eutelescope").env['MILLEPEDEII_VERSION']='trunk'
 
 
-ilcsoft.install( PathFinder( PathFinder_version ))
-ilcsoft.module("PathFinder").download.type="svn"
+# ilcsoft.install( PathFinder( PathFinder_version ))
+# ilcsoft.module("PathFinder").download.type="svn"
 
-ilcsoft.install( MarlinTPC( MarlinTPC_version ))
-ilcsoft.module("MarlinTPC").download.type="svn"
-ilcsoft.module("MarlinTPC").envcmake['INSTALL_DOC']='ON'
+# ilcsoft.install( MarlinTPC( MarlinTPC_version ))
+# ilcsoft.module("MarlinTPC").download.type="svn"
+# ilcsoft.module("MarlinTPC").envcmake['INSTALL_DOC']='ON'
 
 
-ilcsoft.install( BBQ( BBQ_version ))
-ilcsoft.module("BBQ").download.type="svn"
+# ilcsoft.install( BBQ( BBQ_version ))
+# ilcsoft.module("BBQ").download.type="svn"
 
 #fg: needs porting to ROOT6 (dictionary!)
 #ilcsoft.install( Druid( Druid_version ))

releases/v02-03/release-ilcsoft.cfg

@@ -199,17 +199,16 @@ ilcsoft.module("LICH").addDependency( [ 'LCIO', 'ROOT', 'Marlin', 'MarlinUtil' ]
 #ilcsoft.module("Eutelescope").env['EUDAQ_VERSION']='trunk'
 #ilcsoft.module("Eutelescope").env['MILLEPEDEII_VERSION']='trunk'
 
+# ilcsoft.install( PathFinder( PathFinder_version ))
+# ilcsoft.module("PathFinder").download.type="svn"
 
-ilcsoft.install( PathFinder( PathFinder_version ))
-ilcsoft.module("PathFinder").download.type="svn"
+# ilcsoft.install( MarlinTPC( MarlinTPC_version ))
+# ilcsoft.module("MarlinTPC").download.type="svn"
+# ilcsoft.module("MarlinTPC").envcmake['INSTALL_DOC']='ON'
 
-ilcsoft.install( MarlinTPC( MarlinTPC_version ))
-ilcsoft.module("MarlinTPC").download.type="svn"
-ilcsoft.module("MarlinTPC").envcmake['INSTALL_DOC']='ON'
 
-
-ilcsoft.install( BBQ( BBQ_version ))
-ilcsoft.module("BBQ").download.type="svn"
+# ilcsoft.install( BBQ( BBQ_version ))
+# ilcsoft.module("BBQ").download.type="svn"
 
 #fg: needs porting to ROOT6 (dictionary!)
 #ilcsoft.install( Druid( Druid_version ))

scripts/tagging/parseversion.py

@@ -57,7 +57,7 @@ def _parseVersion( self ):
       elif 'pre' in parts[2]:
         self.pre = int(parts[2].strip('pre'))
       else:
-        self.patch = int( parts[2] )
+        self.patch = int( parts[2].strip('p') )
 
     if len(parts) >= 4:
       if 'pre' == parts[3]:

scripts/tests/Test_Tagging.py

@@ -11,7 +11,13 @@
 except ImportError:  # for python3
   import builtins
   builtin_module_name = 'builtins'
+
 import unittest
+try: # monkey patch python2 to also use non-deprecated functionality
+  unittest.TestCase.assertRaisesRegex
+except AttributeError:
+  unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
+
 import os
 import shutil
 import sys
@@ -211,7 +217,7 @@ def test_ctor_fail_1( self ):
                 }
               ]
 
-    with self.assertRaisesRegexp( RuntimeError, "Invalid version required"), \
+    with self.assertRaisesRegex( RuntimeError, "Invalid version required"), \
          patch( "tagging.gitinterface.Repo.getGithubTags", new=Mock( return_value=myTagInfo)):
       self.repo = Repo(owner="tester", repo="testrepo", branch="testbranch", newVersion="v01-03-20-pre", preRelease=True, dryRun=True)
 
@@ -225,7 +231,7 @@ def test_ctor_fail_2( self ):
                   "tarball_url": "tarball/v0.1"
                 }
               ]
-    with self.assertRaisesRegexp( RuntimeError, "Invalid version required"), \
+    with self.assertRaisesRegex( RuntimeError, "Invalid version required"), \
          patch( "tagging.gitinterface.Repo.getGithubTags", new=Mock( return_value=myTagInfo)):
       self.repo = Repo(owner="tester", repo="testrepo", branch="testbranch", newVersion="v01-03-19", preRelease=True, dryRun=True)
 
@@ -241,7 +247,7 @@ def test_ctor_fail_3( self ):
               ]
 
 
-    with self.assertRaisesRegexp( RuntimeError, "Invalid version required"), \
+    with self.assertRaisesRegex( RuntimeError, "Invalid version required"), \
          patch( "tagging.gitinterface.Repo.getGithubTags", new=Mock( return_value=myTagInfo)):
       self.repo = Repo(owner="tester", repo="testrepo", branch="testbranch", newVersion="v01-03-20-pre1", preRelease=True, dryRun=True)