diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml index 8e30b12e2..5ea90e0ef 100644 --- a/scripts/nightly.yaml +++ b/scripts/nightly.yaml @@ -264,7 +264,7 @@ stages: artifactName: 'Mac' targetPath: $(Agent.TempDirectory) - script: cd $(Agent.TempDirectory); mkdir osx-bin; cd osx-bin; unzip ../*osx*.zip - - script: cd $(Agent.TempDirectory); mkdir linux-bin; cd linux-bin; unzip ../*glibc-2.9.zip + - script: cd $(Agent.TempDirectory); mkdir linux-bin; cd linux-bin; unzip ../*glibc*.zip - script: cd $(Agent.TempDirectory); mkdir win32-bin; cd win32-bin; unzip ../*x86-win*.zip - script: cd $(Agent.TempDirectory); mkdir win64-bin; cd win64-bin; unzip ../*x64-win*.zip - script: python3 -m pip install --user -U setuptools wheel diff --git a/src/api/python/setup.py b/src/api/python/setup.py index 66c12c58b..8915e53ba 100644 --- a/src/api/python/setup.py +++ b/src/api/python/setup.py @@ -234,7 +234,7 @@ if 'bdist_wheel' in sys.argv and '--plat-name' not in sys.argv: distos = RELEASE_METADATA[2] if distos in ('debian', 'ubuntu') or 'linux' in distos: raise Exception("Linux binary distributions must be built on centos to conform to PEP 513") - elif distos == 'centos': + elif distos == 'libc': if arch == 'x64': plat_name = 'manylinux1_x86_64' else: @@ -251,9 +251,9 @@ if 'bdist_wheel' in sys.argv and '--plat-name' not in sys.argv: if arch == 'x64': plat_name ='macosx_%s_x86_64' % osver.replace('.', '_') else: - raise Exception('idk how os x works. what goes here?') + raise Exception(f"idk how os {distos} {osvar} works. what goes here?") else: - raise Exception("idk how to translate between this z3 release os and the python naming scheme") + raise Exception(f"idk how to translate between this z3 release os {distos} and the python naming scheme") idx = sys.argv.index('bdist_wheel') + 1 sys.argv.insert(idx, '--plat-name') diff --git a/src/sat/sat_ddfw.cpp b/src/sat/sat_ddfw.cpp index d69c4516c..1d4d4d1fc 100644 --- a/src/sat/sat_ddfw.cpp +++ b/src/sat/sat_ddfw.cpp @@ -224,7 +224,6 @@ namespace sat { m_flat_use_list.append(ul); } m_use_list_index.push_back(m_flat_use_list.size()); -// m_use_list_index.push_back(m_flat_use_list.size()); } diff --git a/src/sat/sat_ddfw.h b/src/sat/sat_ddfw.h index 89d74f8f4..358c87656 100644 --- a/src/sat/sat_ddfw.h +++ b/src/sat/sat_ddfw.h @@ -107,12 +107,7 @@ namespace sat { use_list(ddfw& p, literal lit): p(p), i(lit.index()) {} unsigned const* begin() { return p.m_flat_use_list.c_ptr() + p.m_use_list_index[i]; } - unsigned const* end() { - if (p.m_use_list_index.size() <= i + 1) { - std::cout << "out of bounds\n"; - } - VERIFY(p.m_use_list_index.size() > i + 1); return p.m_flat_use_list.c_ptr() + p.m_use_list_index[i + 1]; - } + unsigned const* end() { return p.m_flat_use_list.c_ptr() + p.m_use_list_index[i + 1]; } }; void flatten_use_list();