scyjava 1.10.0__tar.gz → 1.10.2__tar.gz

{scyjava-1.10.0 → scyjava-1.10.2}/Makefile

@@ -20,6 +20,9 @@ check:
 lint: check
 	bin/lint.sh
 
+fmt: check
+	bin/fmt.sh
+
 test: check
 	bin/test.sh
 

{scyjava-1.10.0/src/scyjava.egg-info → scyjava-1.10.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: scyjava
-Version: 1.10.0
+Version: 1.10.2
 Summary: Supercharged Java access from Python
 Author-email: SciJava developers <ctrueden@wisc.edu>
 License: The Unlicense
@@ -18,6 +18,8 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: License :: OSI Approved :: The Unlicense (Unlicense)
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: Unix
@@ -31,18 +33,14 @@ Description-Content-Type: text/markdown
 Requires-Dist: jpype1>=1.3.0
 Requires-Dist: jgo
 Provides-Extra: dev
-Requires-Dist: autopep8; extra == "dev"
-Requires-Dist: black; extra == "dev"
+Requires-Dist: assertpy; extra == "dev"
 Requires-Dist: build; extra == "dev"
-Requires-Dist: flake8; extra == "dev"
-Requires-Dist: flake8-pyproject; extra == "dev"
-Requires-Dist: flake8-typing-imports; extra == "dev"
-Requires-Dist: isort; extra == "dev"
 Requires-Dist: jep; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
 Requires-Dist: numpy; extra == "dev"
 Requires-Dist: pandas; extra == "dev"
+Requires-Dist: ruff; extra == "dev"
 Requires-Dist: toml; extra == "dev"
 Requires-Dist: validate-pyproject[all]; extra == "dev"
 

scyjava-1.10.2/bin/fmt.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+dir=$(dirname "$0")
+cd "$dir/.."
+
+exitCode=0
+ruff check --fix
+code=$?; test $code -eq 0 || exitCode=$code
+ruff format
+code=$?; test $code -eq 0 || exitCode=$code
+exit $exitCode

{scyjava-1.10.0 → scyjava-1.10.2}/bin/lint.sh

@@ -4,11 +4,9 @@ dir=$(dirname "$0")
 cd "$dir/.."
 
 exitCode=0
-black src tests
+ruff check
 code=$?; test $code -eq 0 || exitCode=$code
-isort src tests
-code=$?; test $code -eq 0 || exitCode=$code
-python -m flake8 src tests
+ruff format --check
 code=$?; test $code -eq 0 || exitCode=$code
 validate-pyproject pyproject.toml
 code=$?; test $code -eq 0 || exitCode=$code

{scyjava-1.10.0 → scyjava-1.10.2}/dev-environment.yml

@@ -17,7 +17,6 @@
 name: scyjava-dev
 channels:
   - conda-forge
-  - defaults
 dependencies:
   - python >= 3.8
   # Project dependencies
@@ -28,19 +27,15 @@ dependencies:
   - numpy
   - pandas
   # Developer tools
-  - autopep8
-  - black
-  - build
-  - flake8
-  - flake8-typing-imports
-  - isort
+  - assertpy
   - pytest
   - pytest-cov
+  - python-build
+  - ruff
   - toml
+  - validate-pyproject
   # Project from source
   - pip
   - pip:
     - git+https://github.com/ninia/jep.git@cfca63f8b3398daa6d2685428660dc4b2bfab67d
-    - flake8-pyproject
-    - validate-pyproject[all]
     - -e .

{scyjava-1.10.0 → scyjava-1.10.2}/environment.yml

@@ -18,7 +18,6 @@
 name: scyjava
 channels:
   - conda-forge
-  - defaults
 dependencies:
   - python >= 3.8
   # Project dependencies

{scyjava-1.10.0 → scyjava-1.10.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "scyjava"
-version = "1.10.0"
+version = "1.10.2"
 description = "Supercharged Java access from Python"
 license = {text = "The Unlicense"}
 authors = [{name = "SciJava developers", email = "ctrueden@wisc.edu"}]
@@ -19,6 +19,8 @@ classifiers = [
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
     "License :: OSI Approved :: The Unlicense (Unlicense)",
     "Operating System :: Microsoft :: Windows",
     "Operating System :: Unix",
@@ -39,20 +41,16 @@ dependencies = [
 [project.optional-dependencies]
 # NB: Keep this in sync with dev-environment.yml!
 dev = [
-    "autopep8",
-    "black",
+    "assertpy",
     "build",
-    "flake8",
-    "flake8-pyproject",
-    "flake8-typing-imports",
-    "isort",
     "jep",
     "pytest",
     "pytest-cov",
     "numpy",
     "pandas",
+    "ruff",
     "toml",
-    "validate-pyproject[all]",
+    "validate-pyproject[all]"
 ]
 
 [project.urls]
@@ -70,14 +68,16 @@ include-package-data = false
 where = ["src"]
 namespaces = false
 
-# Thanks to Flake8-pyproject, we can configure flake8 here!
-[tool.flake8]
-exclude = ["bin", "build", "dist"]
+# ruff configuration
+[tool.ruff]
+line-length = 88
+src = ["src", "tests"]
+include = ["pyproject.toml", "src/**/*.py", "tests/**/*.py"]
+extend-exclude = ["bin", "build", "dist"]
+
+[tool.ruff.lint]
 extend-ignore = ["E203"]
-# See https://black.readthedocs.io/en/stable/guides/using_black_with_other_tools.html#flake8
-max-line-length = 88
-min_python_version = "3.8"
-per-file-ignores = "__init__.py:F401"
 
-[tool.isort]
-profile = "black"
+[tool.ruff.lint.per-file-ignores]
+# Ignore `E402` (import violations) in all `__init__.py` files, and in `path/to/file.py`.
+"__init__.py" = ["E402", "F401"]

{scyjava-1.10.0 → scyjava-1.10.2/src/scyjava.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: scyjava
-Version: 1.10.0
+Version: 1.10.2
 Summary: Supercharged Java access from Python
 Author-email: SciJava developers <ctrueden@wisc.edu>
 License: The Unlicense
@@ -18,6 +18,8 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: License :: OSI Approved :: The Unlicense (Unlicense)
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: Unix
@@ -31,18 +33,14 @@ Description-Content-Type: text/markdown
 Requires-Dist: jpype1>=1.3.0
 Requires-Dist: jgo
 Provides-Extra: dev
-Requires-Dist: autopep8; extra == "dev"
-Requires-Dist: black; extra == "dev"
+Requires-Dist: assertpy; extra == "dev"
 Requires-Dist: build; extra == "dev"
-Requires-Dist: flake8; extra == "dev"
-Requires-Dist: flake8-pyproject; extra == "dev"
-Requires-Dist: flake8-typing-imports; extra == "dev"
-Requires-Dist: isort; extra == "dev"
 Requires-Dist: jep; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
 Requires-Dist: numpy; extra == "dev"
 Requires-Dist: pandas; extra == "dev"
+Requires-Dist: ruff; extra == "dev"
 Requires-Dist: toml; extra == "dev"
 Requires-Dist: validate-pyproject[all]; extra == "dev"
 

{scyjava-1.10.0 → scyjava-1.10.2}/src/scyjava.egg-info/SOURCES.txt

@@ -7,9 +7,11 @@ environment.yml
 pyproject.toml
 bin/check.sh
 bin/clean.sh
+bin/fmt.sh
 bin/lint.sh
 bin/setup.sh
 bin/test.sh
+src/scyjava/.__init__.py.swp
 src/scyjava/__init__.py
 src/scyjava/_arrays.py
 src/scyjava/_convert.py
@@ -29,6 +31,12 @@ tests/test_convert.py
 tests/test_pandas.py
 tests/test_types.py
 tests/test_version.py
+tests/.pytest_cache/.gitignore
+tests/.pytest_cache/CACHEDIR.TAG
+tests/.pytest_cache/README.md
+tests/.pytest_cache/v/cache/lastfailed
+tests/.pytest_cache/v/cache/nodeids
+tests/.pytest_cache/v/cache/stepwise
 tests/it/awt.py
 tests/it/headless.py
 tests/it/java_heap.py

{scyjava-1.10.0 → scyjava-1.10.2}/src/scyjava.egg-info/requires.txt

@@ -2,17 +2,13 @@ jpype1>=1.3.0
 jgo
 
 [dev]
-autopep8
-black
+assertpy
 build
-flake8
-flake8-pyproject
-flake8-typing-imports
-isort
 jep
 pytest
 pytest-cov
 numpy
 pandas
+ruff
 toml
 validate-pyproject[all]

scyjava-1.10.2/tests/.pytest_cache/.gitignore

@@ -0,0 +1,2 @@
+# Created by pytest automatically.
+*

scyjava-1.10.2/tests/.pytest_cache/CACHEDIR.TAG

@@ -0,0 +1,4 @@
+Signature: 8a477f597d28d172789f06886806bc55
+# This file is a cache directory tag created by pytest.
+# For information about cache directory tags, see:
+#	https://bford.info/cachedir/spec.html

scyjava-1.10.2/tests/.pytest_cache/README.md

@@ -0,0 +1,8 @@
+# pytest cache directory #
+
+This directory contains data from the pytest's cache plugin,
+which provides the `--lf` and `--ff` options, as well as the `cache` fixture.
+
+**Do not** commit this to version control.
+
+See [the docs](https://docs.pytest.org/en/stable/how-to/cache.html) for more information.

scyjava-1.10.2/tests/.pytest_cache/v/cache/lastfailed

@@ -0,0 +1,3 @@
+{
+  "test_arrays.py": true
+}

scyjava-1.10.2/tests/.pytest_cache/v/cache/nodeids

@@ -0,0 +1,4 @@
+[
+  "test_types.py::TestTypes::test_numeric_bounds",
+  "test_types.py::TestTypes::test_value_bounds"
+]

scyjava-1.10.2/tests/.pytest_cache/v/cache/stepwise

@@ -0,0 +1 @@
+[]

scyjava-1.10.2/tests/it/java_heap.py

@@ -0,0 +1,35 @@
+"""
+Test scyjava JVM memory-related functions.
+"""
+
+from assertpy import assert_that
+
+import scyjava
+
+mb_initial = 50  # initial MB of memory to snarf up
+mb_tolerance = 10  # ceiling of expected MB in use
+
+scyjava.config.set_heap_min(mb=mb_initial)
+scyjava.config.set_heap_max(gb=1)
+
+assert not scyjava.jvm_started()
+scyjava.start_jvm()
+
+assert scyjava.available_processors() >= 1
+
+mb_max = scyjava.memory_max() // 1024 // 1024
+mb_total = scyjava.memory_total() // 1024 // 1024
+mb_used = scyjava.memory_used() // 1024 // 1024
+
+assert_that(
+    mb_used, "Used memory should be less than the current memory total"
+).is_less_than_or_equal_to(mb_total)
+assert_that(
+    mb_total, "current memory total should be less than maximum memory"
+).is_less_than_or_equal_to(mb_max)
+assert_that(mb_max, "maximum heap size should be approx. 1 GB").is_between(900, 1024)
+
+assert_that(mb_used, "most memory should be available").is_less_than(mb_tolerance)
+assert_that(mb_total, "total memory should be close to initial").is_close_to(
+    mb_initial, tolerance=mb_tolerance
+)

scyjava-1.10.0/tests/it/java_heap.py

@@ -1,34 +0,0 @@
-"""
-Test scyjava JVM memory-related functions.
-"""
-
-import scyjava
-
-mb_initial = 50  # initial MB of memory to snarf up
-
-scyjava.config.set_heap_min(mb=mb_initial)
-scyjava.config.set_heap_max(gb=1)
-
-assert not scyjava.jvm_started()
-scyjava.start_jvm()
-
-assert scyjava.available_processors() >= 1
-
-mb_max = scyjava.memory_max() // 1024 // 1024
-mb_total = scyjava.memory_total() // 1024 // 1024
-mb_used = scyjava.memory_used() // 1024 // 1024
-
-# Used memory should be less than the current memory total,
-# which should be less than the maximum heap size.
-assert mb_used <= mb_total <= mb_max, f"{mb_used=} {mb_total=} {mb_max=}"
-
-# The maximum heap size should be approximately 1 GB.
-assert 900 <= mb_max <= 1024, f"{mb_max=}"
-
-# Most of that memory should still be free; i.e.,
-# we should not be using more than a few MB yet.
-assert mb_used <= 5, f"{mb_used=}"
-
-# The total MB available to Java at this moment
-# should be close to our requested initial amount.
-assert abs(mb_total - mb_initial) < 5, f"{mb_total=} {mb_initial=}"