Merge pull request datajoint#98 from guzman-raphael/stage

Add `MYM_` env var prefix, bump versions, update binaries
cnuahs · Mar 9, 2022 · 7de4740 · 7de4740
2 parents 158e091 + 5816c0f
commit 7de4740
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/LNX-docker-compose.yml b/LNX-docker-compose.yml
@@ -11,7 +11,7 @@ services:
       - MYSQL_ROOT_PASSWORD=simple
   fakeservices.datajoint.io:
     <<: *net
-    image: datajoint/nginx:v0.0.16
+    image: datajoint/nginx:v0.1.1
     environment:
     - ADD_db_TYPE=DATABASE
     - ADD_db_ENDPOINT=db:3306

diff --git a/distribution/mexa64/mym.mexa64 b/distribution/mexa64/mym.mexa64
diff --git a/distribution/mexmaci64/mym.mexmaci64 b/distribution/mexmaci64/mym.mexmaci64
diff --git a/distribution/mexw64/mym.mexw64 b/distribution/mexw64/mym.mexw64
diff --git a/local-docker-compose.yml b/local-docker-compose.yml
@@ -16,7 +16,7 @@ services:
     #   - ./mysql/data:/var/lib/mysql
   fakeservices.datajoint.io:
     <<: *net
-    image: datajoint/nginx:v0.0.16
+    image: datajoint/nginx:v0.1.1
     environment:
     - ADD_db_TYPE=DATABASE
     - ADD_db_ENDPOINT=db:3306

diff --git a/src/mym.cpp b/src/mym.cpp
@@ -360,11 +360,11 @@ static void updateplugindir() {
 }
 /**********************************************************************
  *use32bitdims():   Check if dimensions should be read as 32-bit
- *  Get USE_32_BIT_DIMS environment variable
- *  Return true/false based on USE_32_BIT_DIMS flag
+ *  Get MYM_USE_32BIT_DIMS environment variable
+ *  Return true/false based on MYM_USE_32BIT_DIMS flag
  **********************************************************************/
 static bool use32bitdims() {
-    return getenv("USE_32BIT_DIMS") && strcasecmp(getenv("USE_32BIT_DIMS"), "true") == 0;
+    return getenv("MYM_USE_32BIT_DIMS") && strcasecmp(getenv("MYM_USE_32BIT_DIMS"), "true") == 0;
 }
 /**********************************************************************
  * mysql():  Execute the actual action

diff --git a/src/mym.h b/src/mym.h
@@ -34,7 +34,7 @@
 // mym version information
 #define MYM_VERSION_MAJOR 2
 #define MYM_VERSION_MINOR 8
-#define MYM_VERSION_BUGFIX 4
+#define MYM_VERSION_BUGFIX 5
 
 
 // some local defintion

diff --git a/tests/TestExternal.m b/tests/TestExternal.m
@@ -113,9 +113,9 @@ function TestExternal_test32BitRead(testCase)
             data.sides = 'llllrrl';
             data.hits = [NaN,1,1,0,1,0,NaN];
 
-            setenv('USE_32BIT_DIMS', 'true');
+            setenv('MYM_USE_32BIT_DIMS', 'true');
             unpacked = mym('deserialize', packed);
-            setenv('USE_32BIT_DIMS', 'false');
+            setenv('MYM_USE_32BIT_DIMS', 'false');
 
             testCase.verifyEqual(unpacked, data);
         end