fastremap 1.15.0__tar.gz → 1.15.1__tar.gz

{fastremap-1.15.0 → fastremap-1.15.1}/.github/workflows/build_wheel.yml

@@ -28,13 +28,13 @@ jobs:
         uses: docker/setup-qemu-action@v1
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.19.1
+        uses: pypa/cibuildwheel@v2.22.0
         # to supply options, put them in 'env', like:
         env:
           CIBW_ARCHS_LINUX: ${{matrix.arch}}
           CIBW_BEFORE_BUILD: pip install numpy setuptools wheel cython 
           CIBW_ARCHS_MACOS: "x86_64 arm64"
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           path: ./wheelhouse/*.whl

fastremap-1.15.1/.github/workflows/test.yml

@@ -0,0 +1,37 @@
+name: Tests
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - "*"
+
+jobs:
+  run_tests:
+    name: Test ${{ matrix.os }} Python ${{ matrix.python-version }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-20.04, macos-latest, windows-2019]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+
+    steps:
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - uses: actions/checkout@v2
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install pytest -r requirements.txt -r requirements_dev.txt setuptools wheel
+
+      - name: Compile
+        run: python setup.py develop
+
+      - name: Test with pytest
+        run: pytest -v -x automated_test.py

{fastremap-1.15.0 → fastremap-1.15.1}/ChangeLog

@@ -1,6 +1,17 @@
 CHANGES
 =======
 
+1.15.1
+------
+
+* ci: use artifact v3
+* ci: bump cibuildwheel for py313
+* ci: add setuptools
+* ci: incorrect reference to requirements\_dev.txt
+* ci: rename main -> master to trigger test process
+* refactor: remove old obsolete test file
+* ci: add automated testing through GHA
+
 1.15.0
 ------
 

{fastremap-1.15.0 → fastremap-1.15.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastremap
-Version: 1.15.0
+Version: 1.15.1
 Summary: Remap, mask, renumber, unique, and in-place transposition of 3D labeled images. Point cloud too.
 Home-page: https://github.com/seung-lab/fastremap/
 Author: William Silversmith

{fastremap-1.15.0 → fastremap-1.15.1}/fastremap.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastremap
-Version: 1.15.0
+Version: 1.15.1
 Summary: Remap, mask, renumber, unique, and in-place transposition of 3D labeled images. Point cloud too.
 Home-page: https://github.com/seung-lab/fastremap/
 Author: William Silversmith

{fastremap-1.15.0 → fastremap-1.15.1}/fastremap.egg-info/SOURCES.txt

@@ -14,10 +14,10 @@ requirements.txt
 requirements_dev.txt
 setup.cfg
 setup.py
-test.cpp
 test.py
 tox.ini
 .github/workflows/build_wheel.yml
+.github/workflows/test.yml
 fastremap.egg-info/PKG-INFO
 fastremap.egg-info/SOURCES.txt
 fastremap.egg-info/dependency_links.txt

fastremap-1.15.1/fastremap.egg-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "0ea7a0b", "is_release": true}

{fastremap-1.15.0 → fastremap-1.15.1}/src/fastremap.pyx

@@ -897,7 +897,7 @@ def unique_via_sort(cnp.ndarray[ALLINT, ndim=1] labels):
 
   del labels
 
-  return np.array(uniq), np.array(counts)
+  return np.array(uniq, dtype=labels.dtype), np.array(counts)
 
 @cython.boundscheck(False)
 @cython.wraparound(False)  # turn off negative index wrapping for entire function

fastremap-1.15.0/fastremap.egg-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "80ce9fc", "is_release": true}

fastremap-1.15.0/test.cpp

@@ -1,70 +0,0 @@
-#include <cstdio>
-#include <cstdint>
-#include "ipt.hpp"
-
-void print(int* arr, int sx, int sy) {
-	for (int y = 0; y < sy; y++) {
-		for (int x = 0; x < sx; x++) {
-			printf("%i ", arr[x + sx * y]);
-		}
-		printf("\n");
-	}
-	printf("\n");
-}
-
-void print(int* arr, int sx, int sy, int sz) {
-	if (sx == 1) {
-		print(arr, sy, sz);
-		return;
-	}
-
-	for (int z = 0; z < sz; z++) {
-		for (int y = 0; y < sy; y++) {
-			for (int x = 0; x < sx; x++) {
-				printf("%i ", arr[x + sx * y + sx * sy * z]);
-			}
-			printf("\n");
-		}
-		printf("\n");
-	}
-	printf("\n");
-}
-
-
-void print(float* arr, int sx, int sy, int sz, int sw) {
-	for (int w = 0; w < sw; w++) {
-		for (int z = 0; z < sz; z++) {
-			for (int y = 0; y < sy; y++) {
-				for (int x = 0; x < sx; x++) {
-					printf("%.1f ", arr[x + sx * y + sx * sy * z]);
-				}
-				printf("\n");
-			}
-			printf("\n");
-		}
-		printf("\n");
-	}
-	printf("\n");
-}
-
-int main () {
-	int sx = 7;
-	int sy = 3;
-	int sz = 5;
-	int sw = 1;
-
-	int *arr = new int[sx * sy * sz * sw]();
-	
-	for (int i = 0; i < sx * sy * sz * sw; i++) {
-		arr[i] = (int)i;
-	}
-	
-	print(arr, sx, sy, sz);
-	// ipt::rect_ipt_2d<int>(arr, sx, sy);
-	// ipt::rect_ipt_3d<int>(arr, sx, sy, sz);
-	ipt::rect_ipt<int>(arr, sx, sy, sz);
-	print(arr, sz, sy, sx);
-	delete []arr;
-
-	return 0;
-}