Update requirements.

Aquaveo · Oct 13, 2020 · 5f6d18c · 5f6d18c
1 parent 378f16b
commit 5f6d18c
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 42 deletions.
diff --git a/.github/workflows/XmsMesher-CI.yaml b/.github/workflows/XmsMesher-CI.yaml
@@ -60,6 +60,7 @@ jobs:
       CONAN_ARCHS: x86_64
       CONAN_USERNAME: aquaveo
       CONAN_CHANNEL: testing
+      CONAN_STABLE_BRANCH_PATTERN: 'we_should_never_use_this_string_for_a_branch_name'
       CONAN_LOGIN_USERNAME: ${{ secrets.CONAN_USER_SECRET }}
       CONAN_PASSWORD: ${{ secrets.CONAN_PASSWORD_SECRET }}
       CONAN_REMOTES: https://conan.aquaveo.com
@@ -122,7 +123,7 @@ jobs:
         with:
           CONAN_CHANNEL: stable
           AQUAPI_URL: ${{ secrets.AQUAPI_URL_STABLE }}
-        if: startsWith(github.ref, 'refs/tags/') && startsWith(env.BRANCH_NAME, 'release-')
+        if: startsWith(github.ref, 'refs/tags/') && startsWith(env.BRANCH_NAME, ${{ env.XMS_VERSION }})
       # Build the Conan Package
       - name: Build the Conan Packages
         run: python build.py
@@ -178,6 +179,7 @@ jobs:
       CONAN_ARCHS: x86_64
       CONAN_USERNAME: aquaveo
       CONAN_CHANNEL: testing
+      CONAN_STABLE_BRANCH_PATTERN: 'we_should_never_use_this_string_for_a_branch_name'
       CONAN_LOGIN_USERNAME: ${{ secrets.CONAN_USER_SECRET }}
       CONAN_PASSWORD: ${{ secrets.CONAN_PASSWORD_SECRET }}
       CONAN_REMOTES: https://conan.aquaveo.com
@@ -245,7 +247,7 @@ jobs:
         with:
           CONAN_CHANNEL: stable
           AQUAPI_URL: ${{ secrets.AQUAPI_URL_STABLE }}
-        if: startsWith(github.ref, 'refs/tags/') && startsWith(env.BRANCH_NAME, 'release-')
+        if: startsWith(github.ref, 'refs/tags/') && startsWith(env.BRANCH_NAME, ${{ env.XMS_VERSION }})
       # Build the Conan Package
       - name: Build the Conan Packages
         run: |
@@ -303,6 +305,7 @@ jobs:
       CONAN_ARCHS: x86_64
       CONAN_USERNAME: aquaveo
       CONAN_CHANNEL: testing
+      CONAN_STABLE_BRANCH_PATTERN: 'we_should_never_use_this_string_for_a_branch_name'
       CONAN_LOGIN_USERNAME: ${{ secrets.CONAN_USER_SECRET }}
       CONAN_PASSWORD: ${{ secrets.CONAN_PASSWORD_SECRET }}
       CONAN_REMOTES: https://conan.aquaveo.com
@@ -366,7 +369,7 @@ jobs:
         with:
           CONAN_CHANNEL: stable
           AQUAPI_URL: ${{ secrets.AQUAPI_URL_STABLE }}
-        if: startsWith(github.ref, 'refs/tags/') && startsWith(env.BRANCH_NAME, 'release-')
+        if: startsWith(github.ref, 'refs/tags/') && startsWith(env.BRANCH_NAME, ${{ env.XMS_VERSION }})
       # Build the Conan Package
       - name: Build the Conan Packages
         run: python build.py

diff --git a/_package/setup.py b/_package/setup.py
@@ -1,32 +1,32 @@
-"""Install the xmsmesher package."""
-import os
-
-from setuptools import setup
-
-from xms.mesher import __version__
-
-
-# allow setup.py to be run from any path
-os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))
-
-requires = [
-    'numpy',
-    'xmscore>=3.0.5',
-    'xmsgrid>=4.1.0',
-    'xmsinterp>=3.1.1',
-]
-
-version = __version__
-
-setup(
-    python_requires='>=3.6',
-    name='xmsmesher',
-    version=version,
-    packages=['xms.mesher', 'xms.mesher.meshing', 'xms.mesher.api'],
-    include_package_data=True,
-    license='BSD 2-Clause License',
-    description='',
-    author='Aquaveo',
-    install_requires=requires,
-    package_data={'': ['*.pyd', '*.so']},
-)
+"""Install the xmsmesher package."""
+import os
+
+from setuptools import setup
+
+from xms.mesher import __version__
+
+
+# allow setup.py to be run from any path
+os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))
+
+requires = [
+    'numpy',
+    'xmscore>=4.0.0',
+    'xmsgrid>=5.0.2',
+    'xmsinterp>=4.0.0',
+]
+
+version = __version__
+
+setup(
+    python_requires='>=3.6',
+    name='xmsmesher',
+    version=version,
+    packages=['xms.mesher', 'xms.mesher.meshing', 'xms.mesher.api'],
+    include_package_data=True,
+    license='BSD 2-Clause License',
+    description='',
+    author='Aquaveo',
+    install_requires=requires,
+    package_data={'': ['*.pyd', '*.so']},
+)
diff --git a/conanfile.py b/conanfile.py
@@ -57,9 +57,9 @@ def requirements(self):
         if not self.settings.compiler == "clang" and self.options.pybind:
             self.requires("pybind11/2.5.0@aquaveo/testing")
 
-        self.requires("xmscore/4.0.0-rc14@aquaveo/testing")
-        self.requires("xmsgrid/5.0.0-rc3@aquaveo/testing")
-        self.requires("xmsinterp/4.0.0-rc1@aquaveo/testing")
+        self.requires("xmscore/4.0.0@aquaveo/stable")
+        self.requires("xmsgrid/5.0.2@aquaveo/stable")
+        self.requires("xmsinterp/4.0.0@aquaveo/stable")
 
     def build(self):
         cmake = CMake(self)
@@ -105,10 +105,11 @@ def build(self):
                 # We are uploading to aquapi here instead of pypi because pypi doesn't accept
                 # the type of package 'linux_x86_64 that we want to upload. They only accept
                 # manylinux1 as the plat-tag
-                is_release = self.env.get("RELEASE_PYTHON", 'False')
-                if is_release == 'True' and ((self.settings.os == "Macos" or (self.settings.os == "Linux" and float(self.settings.compiler.version.value) == 6.0))
-                                             or (self.settings.os == "Windows" and
-                                             str(self.settings.compiler.runtime) == "MD")):
+                is_release = self.env.get("RELEASE_PYTHON", 'False') == 'True'
+                is_mac_os = self.settings.os == 'Macos'
+                is_gcc_6 = self.settings.os == "Linux" and float(self.settings.compiler.version.value) == 6.0
+                is_windows_md = (self.settings.os == "Windows" and str(self.settings.compiler.runtime) == "MD")
+                if is_release and (is_mac_os or is_gcc_6 or is_windows_md):
                     devpi_url = self.env.get("AQUAPI_URL", 'NO_URL')
                     devpi_username = self.env.get("AQUAPI_USERNAME", 'NO_USERNAME')
                     devpi_password = self.env.get("AQUAPI_PASSWORD", 'NO_PASSWORD')