move code to new location

.gitignore

@@ -1,10 +1,3 @@
 *.pyc
 __pycache__
-
 *.idea
-
-build/
-dist/
-*.egg-info/
-
-.mypy_cache

README.md

@@ -6,22 +6,13 @@ float_raster calculates pixel values with float64 precision and is capable of dr
 with variable pixel widths and heights.
 
 
-- [Source repository](https://mpxd.net/code/jan/float_raster)
-- [PyPi](https://pypi.org/project/float_raster)
-
-
 ## Installation
 
 Requirements:
-* python >=3.8
+* python 3 (written and tested with 3.5)
 * numpy
 
-Install with pip:
+Install with pip, via git:
 ```bash
-pip3 install float_raster
+pip install git+https://mpxd.net/code/jan/float_raster.git@release
-```
-
-Alternatively, install via git
-```bash
-pip3 install git+https://mpxd.net/code/jan/float_raster.git@release
 ```

float_raster.py

@@ -1,7 +1,16 @@
-from typing import Tuple, Optional
+"""
-import numpy                # type: ignore
+Module for rasterizing polygons, with float-precision anti-aliasing on
+ a non-uniform rectangular grid.
+
+See the documentation for raster(...) for details.
+"""
+
+from typing import Tuple
+import numpy
 from numpy import logical_and, diff, floor, ceil, ones, zeros, hstack, full_like, newaxis
-from scipy import sparse    # type: ignore
+from scipy import sparse
+
+__author__ = 'Jan Petykiewicz'
 
 
 def raster(vertices: numpy.ndarray,
@@ -18,14 +27,11 @@ def raster(vertices: numpy.ndarray,
     Polygons are assumed to have clockwise vertex order; reversing the vertex order is equivalent
      to multiplying the result by -1.
 
-    Args:
+    :param vertices: 2xN ndarray containing x,y coordinates for each vertex of the polygon
-        vertices: 2xN ndarray containing `x,y` coordinates for each vertex of the polygon
+    :param grid_x: x-coordinates for the edges of each pixel (ie, the leftmost two columns span
-        grid_x: x-coordinates for the edges of each pixel (ie, the leftmost two columns span
+        x=grid_x[0] to x=grid_x[1] and x=grid_x[1] to x=grid_x[2])
-                `x=grid_x[0]` to `x=grid_x[1]` and `x=grid_x[1]` to `x=grid_x[2]`)
+    :param grid_y: y-coordinates for the edges of each pixel (see grid_x)
-        grid_y: y-coordinates for the edges of each pixel (see `grid_x`)
+    :return: 2D ndarray with pixel values in the range [0, 1] containing the anti-aliased polygon
-
-    Returns:
-        2D ndarray with pixel values in the range [0, 1] containing the anti-aliased polygon
     """
     vertices = numpy.array(vertices)
     grid_x = numpy.array(grid_x)
@@ -52,7 +58,7 @@ def find_intersections(
         vertices: numpy.ndarray,
         grid_x: numpy.ndarray,
         grid_y: numpy.ndarray
-        ) -> Tuple[numpy.ndarray, numpy.ndarray, numpy.ndarray]:
+        ) -> Tuple[numpy.ndarray]:
     """
     Find intersections between a polygon and grid lines
     """
@@ -129,7 +135,7 @@ def create_vertices(
         vertices: numpy.ndarray,
         grid_x: numpy.ndarray,
         grid_y: numpy.ndarray,
-        new_vertex_data: Optional[Tuple[numpy.ndarray, numpy.ndarray, numpy.ndarray]] = None
+        new_vertex_data: Tuple[numpy.ndarray] = None
         ) -> sparse.coo_matrix:
     """
     Create additional vertices where a polygon crosses gridlines
@@ -174,7 +180,6 @@ def create_vertices(
 
     return vertices
 
-
 def clip_vertices_to_window(
         vertices: numpy.ndarray,
         min_x: float = -numpy.inf,
@@ -205,29 +210,26 @@ def get_raster_parts(
         grid_y: numpy.ndarray
         ) -> sparse.coo_matrix:
     """
-    This function performs the same task as `raster(...)`, but instead of returning a dense array
+    This function performs the same task as raster(...), but instead of returning a dense array
     of pixel values, it returns a sparse array containing the value
-        `(-area + 1j * cover)`
+        (-area + 1j * cover)
     for each pixel which contains a line segment, where
-        `cover`   is the fraction of the pixel's y-length that is traversed by the segment,
+        cover   is the fraction of the pixel's y-length that is traversed by the segment,
-                   multiplied by the sign of `(y_final - y_initial)`
+                 multiplied by the sign of (y_final - y_initial)
-        `area`    is the fraction of the pixel's area covered by the trapezoid formed by
+        area    is the fraction of the pixel's area covered by the trapezoid formed by
-                   the line segment's endpoints (clipped to the cell edges) and their projections
+                 the line segment's endpoints (clipped to the cell edges) and their projections
-                   onto the pixel's left (i.e., lowest-x) edge, again multiplied by
+                 onto the pixel's left (i.e., lowest-x) edge, again multiplied by
-                  the sign of `(y_final - y_initial)`
+                 the sign of (y_final - y_initial)
         Note that polygons are assumed to be wound clockwise.
 
-    The result from `raster(...)` can be obtained with
+    The result from raster(...) can be obtained with
-        `raster_result = numpy.real(lines_result) + numpy.imag(lines_result).cumsum(axis=0)`
+        raster_result = numpy.real(lines_result) + numpy.imag(lines_result).cumsum(axis=0)
 
-    Args:
+    :param vertices: 2xN ndarray containing x,y coordinates for each point in the polygon
-        vertices: 2xN ndarray containing `x, y` coordinates for each point in the polygon
+    :param grid_x: x-coordinates for the edges of each pixel (ie, the leftmost two columns span
-        grid_x: x-coordinates for the edges of each pixel (ie, the leftmost two columns span
+        x=grid_x[0] to x=grid_x[1] and x=grid_x[1] to x=grid_x[2])
-                `x=grid_x[0]` to `x=grid_x[1]` and `x=grid_x[1]` to `x=grid_x[2]`)
+    :param grid_y: y-coordinates for the edges of each pixel (see grid_x)
-        grid_y: y-coordinates for the edges of each pixel (see `grid_x`)
+    :return: Complex sparse COO matrix containing area and cover information
-
-    Returns:
-        Complex sparse COO matrix containing area and cover information
     """
     if grid_x.size < 2 or grid_y.size < 2:
         raise Exception('Grid must contain at least one full pixel')

float_raster/LICENSE.md

@@ -1 +0,0 @@
-../LICENSE.md

float_raster/README.md

@@ -1 +0,0 @@
-../README.md

float_raster/__init__.py

@@ -1,11 +0,0 @@
-"""
-Module for rasterizing polygons, with float-precision anti-aliasing on
- a non-uniform rectangular grid.
-
-See the documentation for float_raster.raster(...) for details.
-"""
-
-from .float_raster import *
-
-__author__ = 'Jan Petykiewicz'
-__version__ = '0.7'

pyproject.toml

@@ -1,38 +0,0 @@
-[build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
-
-[project]
-name = "float_raster"
-description = "High-precision anti-aliasing polygon rasterizer"
-readme = "README.md"
-license = { file = "LICENSE.md" }
-authors = [
-    { name="Jan Petykiewicz", email="jan@mpxd.net" },
-    ]
-homepage = "https://mpxd.net/code/jan/float_raster"
-repository = "https://mpxd.net/code/jan/float_raster"
-keywords = [
-    "coverage",
-    ]
-classifiers = [
-    "Programming Language :: Python :: 3",
-    "Development Status :: 4 - Beta",
-    "Intended Audience :: Developers",
-    "Intended Audience :: Information Technology",
-    "Intended Audience :: Manufacturing",
-    "Intended Audience :: Science/Research",
-    "License :: OSI Approved :: GNU Affero General Public License v3",
-    "Topic :: Scientific/Engineering",
-    "Topic :: Scientific/Engineering :: Electronic Design Automation (EDA)",
-    "Topic :: Multimedia :: Graphics :: Graphics Conversion",
-    ]
-requires-python = ">=3.8"
-dynamic = ["version"]
-dependencies = [
-    "numpy~=1.21",
-    "scipy",
-    ]
-
-[tool.hatch.version]
-path = "float_raster/__init__.py"

setup.py

@@ -0,0 +1,16 @@
+#!/usr/bin/env python
+
+from setuptools import setup
+
+setup(name='float_raster',
+      version='0.4',
+      description='High-precision anti-aliasing polygon rasterizer',
+      author='Jan Petykiewicz',
+      author_email='anewusername@gmail.com',
+      url='https://mpxd.net/code/jan/float_raster',
+      py_modules=['float_raster'],
+      install_requires=[
+            'numpy',
+            'scipy',
+      ],
+      )