change some folder names in azure. Add missing *.so files to roadrunn…

…er.testing subpackage. Increment version since v2.0.9 has missing binaries in testing package
sys-bio · Jul 30, 2021 · fe9021f · fe9021f
1 parent e015ca6
commit fe9021f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,7 +8,7 @@ cmake_minimum_required(VERSION 3.16)
 
 set(ROADRUNNER_VERSION_MAJOR 2)
 set(ROADRUNNER_VERSION_MINOR 0)
-set(ROADRUNNER_VERSION_PATCH 9)
+set(ROADRUNNER_VERSION_PATCH 10)
 
 set(ROADRUNNER_VERSION "${ROADRUNNER_VERSION_MAJOR}.${ROADRUNNER_VERSION_MINOR}.${ROADRUNNER_VERSION_PATCH}")
 project(

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -157,7 +157,7 @@ stages:
               targetFolder: $(Build.ArtifactStagingDirectory)
             displayName: Copy to Staging Area
           - publish: $(Build.ArtifactStagingDirectory)
-            artifact: roadrunner-$(Agent.OS)-$(BuildType)
+            artifact: roadrunner-MacOS10.15-$(BuildType)
             displayName: Publish
 
   - stage: MacBuildRoadrunnerPython
@@ -364,15 +364,15 @@ stages:
           - task: CopyFiles@2
             inputs:
               contents: '$(INSTALL_DIR)/**'
-              targetFolder: $(Build.ArtifactStagingDirectory)/Install-$(PythonName)
+              targetFolder: $(Build.ArtifactStagingDirectory)/roadrunner-MacOS10.15-$(PythonName)
             displayName: Copy Install Tree to Staging Area
           - task: CopyFiles@2
             inputs:
               contents: '$(INSTALL_DIR)/dist/**'
               targetFolder: $(Build.ArtifactStagingDirectory)/pip-wheels
             displayName: Copy Pip Wheels to Staging Area
           - publish: $(Build.ArtifactStagingDirectory)
-            artifact: roadrunner-$(Agent.OS)-$(PythonName)
+            artifact: roadrunner-MacOS10.15-$(PythonName)
             displayName: Publish Pip Wheels Artifacts
 
 ########################################################################
@@ -679,15 +679,15 @@ stages:
           - task: CopyFiles@2
             inputs:
               contents: '$(INSTALL_DIR)/**'
-              targetFolder: $(Build.ArtifactStagingDirectory)/Install-$(PythonName)
+              targetFolder: $(Build.ArtifactStagingDirectory)/roadrunner-Windows2019-$(PythonName)
             displayName: Copy Install Tree to Staging Area
           - task: CopyFiles@2
             inputs:
               contents: '$(INSTALL_DIR)/dist/**'
               targetFolder: $(Build.ArtifactStagingDirectory)/pip-wheels
             displayName: Copy Pip Wheels to Staging Area
           - publish: $(Build.ArtifactStagingDirectory)
-            artifact: roadrunner-$(Agent.OS)-$(PythonName)
+            artifact: roadrunner-Windows2019-$(PythonName)
             displayName: Publish Pip Wheels Artifacts
 
 
@@ -1035,15 +1035,15 @@ stages:
           - task: CopyFiles@2
             inputs:
               contents: '$(INSTALL_DIR)/**'
-              targetFolder: $(Build.ArtifactStagingDirectory)/Install-$(PythonName)
+              targetFolder: $(Build.ArtifactStagingDirectory)/roadrunner-Ubuntu18.04-$(PythonName)
             displayName: Copy Install Tree to Staging Area
           - task: CopyFiles@2
             inputs:
               contents: '$(INSTALL_DIR)/dist/**'
               targetFolder: $(Build.ArtifactStagingDirectory)/pip-wheels
             displayName: Copy Pip Wheels to Staging Area
           - publish: $(Build.ArtifactStagingDirectory)
-            artifact: roadrunner-$(Agent.OS)-$(PythonName)
+            artifact: roadrunner-Ubunti18.04-$(PythonName)
             displayName: Publish Pip Wheels Artifacts
 
 #########################################################################
@@ -1193,6 +1193,8 @@ stages:
               $(PipExecutable) install numpy pytest
               echo "$(PythonExecutable) ./setup.py bdist_wheel"
               $(PythonExecutable) ./setup.py bdist_wheel
+              $(PythonExecutable) ./setup_rrplugins.py bdist_wheel
+
 
               # cd dist
               # wheel=$(realpath $(ls))

diff --git a/wrappers/Python/setup.py b/wrappers/Python/setup.py
@@ -49,7 +49,8 @@ def has_ext_modules(foo):
     package_data={
         # add dll, won't hurt unix, not there anyway
         'roadrunner': ['_roadrunner*', '*.so', '*.so.*', '*.dll', '*.txt', '*.dylib', '*.pyd'],
-        'roadrunner.testing': ['*.xml', '*.txt', '*.dat', 'dsmts/*.xml', 'dsmts/*.csv', 'test_data/*']
+        'roadrunner.testing': ['*.so', '*.so.*', '*.dll', '*.dylib', '*.pyd',
+                               '*.xml', '*.txt', '*.dat', 'dsmts/*.xml', 'dsmts/*.csv', 'test_data/*']
     },
     # read dependencies directly from requirements.txt, Then, manage them
     # only from one place.