Try boost 1.74.0

BoPeng · Mar 29, 2024 · f7708a9 · f7708a9
1 parent af243a7
commit f7708a9
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 18 deletions.
diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml
@@ -30,8 +30,8 @@ jobs:
           cache: 'pip'
       - name: Install boost
         run: |
-          sudo apt-get install libboost-all-dev
-          ln -s /usr/include/boost/ ./boost_1_70_0
+          sudo apt-get install libboost1.74-all-dev
+          ln -s /usr/include/boost/ ./boost_1_74_0
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip

diff --git a/setup.py b/setup.py
@@ -98,8 +98,8 @@ def is_maverick():
 # versions are not available, and will most likely work just fine.
 boost_versions = ['1_35_0', '1_36_0', '1_37_0', '1_38_0', '1_39_0', '1_40_0',
     '1_42_0', '1_43_0', '1_44_0', '1_45_0', '1_46_0', '1_46_1', '1_47_0',
-    '1_48_0', '1_70_0']
-invalid_boost_versions = ['1_41_0']
+    '1_48_0', '1_62_0', '1_72_0', '1_74_0']
+invalid_boost_versions = ['1_41_0', '1_71_0']
 
 included_version = [x for x in boost_versions if os.path.isdir('boost_' + x)]
 invalid_version = [x for x in invalid_boost_versions if os.path.isdir('boost_' + x)]
@@ -127,23 +127,25 @@ def downloadProgress(count, blockSize, totalSize):
     import tarfile
     downloadProgress.counter = 0
     try:
-        BOOST_URL = 'http://downloads.sourceforge.net/project/boost/boost/1.70.0/boost_1_70_0.tar.gz?r=&ts=1440446866&use_mirror=iweb'
-        sys.stdout.write('Downloading boost C++ library 1.70.0 ')
+        boost_version = boost_versions[-1]
+        dot_boost_version = boost_version.replace('_', '.')
+        BOOST_URL = f'http://downloads.sourceforge.net/project/boost/boost/{dot_boost_version}/boost_{boost_version}.tar.gz?r=&ts=1440446866&use_mirror=iweb'
+        sys.stdout.write(f'Downloading boost C++ library {dot_boost_version}')
         sys.stdout.flush()
-        if not os.path.isfile('boost_1_70_0.tar.gz'):
-            urlretrieve(BOOST_URL, 'boost_1_70_0.tar.gz', downloadProgress)
+        if not os.path.isfile(f'boost_{boost_version}.tar.gz'):
+            urlretrieve(BOOST_URL, f'boost_{boost_version}.tar.gz', downloadProgress)
         sys.stdout.write('\n')
         # extract needed files
-        with tarfile.open('boost_1_70_0.tar.gz', 'r:gz') as tar:
-            files = [h for h in tar.getmembers() if h.name.startswith('boost_1_70_0/boost') \
-                or h.name.startswith('boost_1_70_0/libs/iostreams') \
-                or h.name.startswith('boost_1_70_0/libs/serialization') \
-                or h.name.startswith('boost_1_70_0/libs/regex') \
-                or h.name.startswith('boost_1_70_0/libs/detail') ]
+        with tarfile.open(f'boost_{boost_version}.tar.gz', 'r:gz') as tar:
+            files = [h for h in tar.getmembers() if h.name.startswith(f'boost_{boost_version}/boost') \
+                or h.name.startswith(f'boost_{boost_version}/libs/iostreams') \
+                or h.name.startswith(f'boost_{boost_version}/libs/serialization') \
+                or h.name.startswith(f'boost_{boost_version}/libs/regex') \
+                or h.name.startswith(f'boost_{boost_version}/libs/detail') ]
             sys.stdout.write('Extracting %d files\n' % len(files))
             tar.extractall(members=files)
         EMBEDED_BOOST = True
-        boost_dir = 'boost_1_70_0'
+        boost_dir = f'boost_{boost_version}'
     except Exception as e:
         print(e)
         print('The boost C++ library version 1.49.0 is not found under the current directory. Will try to use the system libraries.')
@@ -766,6 +768,3 @@ def ModuInfo(modu, SIMUPOP_VER, SIMUPOP_REV):
         cmdclass = {'build_py': build_py},
         **setup_params
     )
-
-
-