Regex fix (#30)

* Fix to regex pattern Signed-off-by: spagadar <srikanth.pagadarai@analog.com> * setuptools added to requirements file Signed-off-by: spagadar <srikanth.pagadarai@analog.com> * Added setuptools installation to windows workflow Signed-off-by: spagadar <srikanth.pagadarai@analog.com> * Update to pip3 install in windows github workflow Signed-off-by: spagadar <srikanth.pagadarai@analog.com> * Update to set python executable version in windows github workflow yml file Signed-off-by: spagadar <srikanth.pagadarai@analog.com> * Minor update to windows github workflow yml file Signed-off-by: spagadar <srikanth.pagadarai@analog.com> * Removed setuptools installation line from windows github workflow yml file Signed-off-by: spagadar <srikanth.pagadarai@analog.com> --------- Signed-off-by: spagadar <srikanth.pagadarai@analog.com>
analogdevicesinc · Jan 15, 2024 · 544f7e7 · 544f7e7
1 parent 7ab380d
commit 544f7e7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/test-win.yml b/.github/workflows/test-win.yml
@@ -46,7 +46,7 @@ jobs:
       - name: Build and test
         run: |
           "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
-          cmake . -DFFTW_INCLUDE_DIRS="deps\fftw3" -DFFTW_LIBRARIES="$env:GITHUB_WORKSPACE\deps\fftw3\libfftw3-3.lib" -DPYTHON_BINDINGS=ON -DBUILD_TESTS_EXAMPLES=ON -G "Visual Studio 17 2022" -A x64
+          cmake . -DFFTW_INCLUDE_DIRS="deps\fftw3" -DFFTW_LIBRARIES="$env:GITHUB_WORKSPACE\deps\fftw3\libfftw3-3.lib" -DPython3_EXECUTABLE:FILEPATH=$(python -c "import os, sys; print(os.path.dirname(sys.executable) + '\python.exe')") -DPYTHON_BINDINGS=ON -DBUILD_TESTS_EXAMPLES=ON -G "Visual Studio 17 2022" -A x64
           cmake --build . --config Release 
           cp deps\fftw3\* tests\Release\
           cp src\Release\* tests\Release\

diff --git a/include/manager.hpp b/include/manager.hpp
@@ -33,7 +33,7 @@ namespace genalyzer_impl::manager {
  */
 namespace genalyzer_impl::manager {
 
-    static const str_t key_pattern = "[[:alpha:]][[:alnum:]-._]*";
+    static const str_t key_pattern = "[[:alpha:]][[:alnum:]._]*";
 
     void add_object(const str_t& key, object::pointer obj, bool replace);
 
@@ -45,4 +45,4 @@ namespace genalyzer_impl::manager {
 
 } // namespace genalyzer_impl::manager
 
-#endif // GENALYZER_IMPL_MANAGER_HPP
+#endif // GENALYZER_IMPL_MANAGER_HPP
diff --git a/requirements_test.txt b/requirements_test.txt
@@ -4,3 +4,4 @@ cmake-format
 pytest
 pytest-cov
 numpy
+setuptools