Merge pull request #89 from rindPHI/dev

dev

CHANGELOG.md

@@ -5,6 +5,20 @@ This file contains the notable changes in the ISLa project since version 0.2a1
 
 ## [unreleased]
 
+## [1.14.4] - 2024-01-12
+
+### Changed
+
+- TAR formalization: Changed order field of checksum predicate to ensure checksum is
+  evaluated last.
+
+## [1.14.3] - 2024-01-09
+
+### Changed
+
+- Internal refactoring: Replaced custom Maybe/Exceptional classes by the `returns` library.
+- Switched to `pyproject.toml` configuration.
+
 ## [1.14.2] - 2023-11-01
 
 ### Changed

pyproject.toml

@@ -8,12 +8,10 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "isla-solver"
-version = "1.14.2"
 authors = [
     { name = "Dominic Steinhoefel", email = "[email protected]" },
 ]
 description = "The ISLa Input Specification Language and its solver."
-readme = "README.md"
 license = { file = "COPYING" }
 requires-python = ">=3.10"
 classifiers = [
@@ -25,11 +23,61 @@ classifiers = [
     "Topic :: Security",
     "Topic :: Software Development :: Testing",
 ]
+dynamic = ["version", "readme"]
+
+dependencies = [
+    "antlr4-python3-runtime>=4.13",
+    "datrie>=0.8.2",
+    "grammar_to_regex>=0.0.4",
+    "grammar_graph>=0.1.15",
+    "ijson>=3.1.4",
+    "packaging>=21.3",
+    "pathos>=0.2.9",
+    "proxyorderedset>=0.3.5",
+    "returns>=0.21.0",
+    "toml>=0.10.2",
+    "wheel>=0.37.1",
+    "z3-solver>=4.8.17.0,<=4.11.2.0",
+]
 
 [project.urls]
 "Homepage" = "https://github.com/rindPHI/isla/"
 "Bug Tracker" = "https://github.com/rindPHI/isla/issues"
 
+[project.optional-dependencies]
+test = [
+    "docutils>=0.18.1",
+    "matplotlib>=3.5.3",
+    "pytest-cov>=3.0.0",
+    "pytest-html>=3.1.1",
+    "pytest-profiling>=1.7.0",
+    "pytest-pycharm>=0.7.0",
+    "pytest-randomly>=3.12.0",
+    "pytest-rerunfailures>=10.2",
+    "pytest-xdist>=2.4.0",
+    "pytest>=7.1.2",
+    "tox>=3.25.0",
+]
+dev = [
+    "black>=22.8.0",
+    "build>=0.8.0",
+    "flake8>=5.0.4",
+    "setuptools-antlr>=0.4.0",
+    "sphinx>=6.1.3",
+    "sphinx-book-theme>=1.0.0",
+    "twine>=4.0.1",
+]
+
+[project.scripts]
+isla = "isla.cli:main"
+
+[tool.setuptools]
+include-package-data = true  # `true` is the default value
+
+[tool.setuptools.dynamic]
+version = {attr = "isla.__version__"}
+readme = {file = ["README.md"], content-type = "text/markdown"}
+
 [tool.black]
 line-length = 88
 target-version = ['py310']
@@ -41,3 +89,6 @@ extend-exclude = '''
   | ^/src/isla/mexpr_parser/*
 )
 '''
+
+[tool.mypy]
+plugins = ["returns.contrib.mypy.returns_plugin"]

requirements.txt

@@ -5,7 +5,8 @@ grammar_to_regex>=0.0.4
 ijson>=3.1.4
 packaging>=21.3
 pathos>=0.2.9
-proxyorderedset>=0.3.0
+proxyorderedset>=0.3.5
+returns>=0.21.0
 setuptools-antlr>=0.4.0
 toml>=0.10.2
 wheel>=0.37.1

requirements_dev.txt

@@ -10,7 +10,7 @@ ijson>=3.1.4
 matplotlib>=3.5.3
 packaging>=21.3
 pathos>=0.2.9
-proxyorderedset>=0.3.0
+proxyorderedset>=0.3.5
 pytest-cov>=3.0.0
 pytest-html>=3.1.1
 pytest-profiling>=1.7.0
@@ -19,9 +19,10 @@ pytest-randomly>=3.12.0
 pytest-rerunfailures>=10.2
 pytest-xdist>=2.4.0
 pytest>=7.1.2
+returns>=0.21.0
 setuptools-antlr>=0.4.0
-sphinx>=6.1.3
 sphinx-book-theme>=1.0.0
+sphinx>=6.1.3
 toml>=0.10.2
 tox>=3.25.0
 twine>=4.0.1

requirements_test.txt

@@ -7,7 +7,7 @@ ijson>=3.1.4
 matplotlib>=3.5.3
 packaging>=21.3
 pathos>=0.2.9
-proxyorderedset>=0.3.0
+proxyorderedset>=0.3.5
 pytest-cov>=3.0.0
 pytest-html>=3.1.1
 pytest-profiling>=1.7.0
@@ -16,6 +16,7 @@ pytest-randomly>=3.12.0
 pytest-rerunfailures>=10.2
 pytest-xdist>=2.4.0
 pytest>=7.1.2
+returns>=0.21.0
 setuptools-antlr>=0.4.0
 toml>=0.10.2
 tox>=3.25.0

setup.cfg

@@ -1,71 +1,3 @@
-[metadata]
-name = isla
-version = attr: isla.__version__
-author = Dominic Steinhoefel
-author_email = [email protected]
-description = ISLa (Input Specification Language)
-long_description = file: README.md
-long_description_content_type = text/markdown
-url = https://github.com/rindPHI/isla
-project_urls =
-    Bug Tracker = https://github.com/rindPHI/isla/issues
-classifiers =
-    Intended Audience :: Science/Research
-    License :: OSI Approved :: GNU General Public License v3 (GPLv3)
-    Programming Language :: Python :: 3.10
-    Operating System :: OS Independent
-    Topic :: Scientific/Engineering
-    Topic :: Security
-    Topic :: Software Development :: Testing
-
-[options]
-package_dir =
-    = src
-packages = find:
-include_package_data = True
-python_requires = >=3.10
-install_requires =
-    antlr4-python3-runtime>=4.13
-    datrie>=0.8.2
-    grammar_to_regex>=0.0.4
-    grammar_graph>=0.1.15
-    ijson>=3.1.4
-    packaging>=21.3
-    pathos>=0.2.9
-    proxyorderedset>=0.3.0
-    toml>=0.10.2
-    wheel>=0.37.1
-    z3-solver>=4.8.17.0,<=4.11.2.0
-
-[options.extras_require]
-test =
-    docutils>=0.18.1
-    matplotlib>=3.5.3
-    pytest-cov>=3.0.0
-    pytest-html>=3.1.1
-    pytest-profiling>=1.7.0
-    pytest-pycharm>=0.7.0
-    pytest-randomly>=3.12.0
-    pytest-rerunfailures>=10.2
-    pytest-xdist>=2.4.0
-    pytest>=7.1.2
-    tox>=3.25.0
-dev =
-    black>=22.8.0
-    build>=0.8.0
-    flake8>=5.0.4
-    setuptools-antlr>=0.4.0
-    sphinx>=6.1.3
-    sphinx-book-theme>=1.0.0
-    twine>=4.0.1
-
-[options.packages.find]
-where = src
-
-[options.entry_points]
-console_scripts =
-    isla = isla.cli:main
-
 [antlr]
 # Specify grammars to generate parsers for; default: None
 #grammars = <grammar> [grammar> ...]

src/isla/__init__.py

@@ -16,4 +16,4 @@
 # You should have received a copy of the GNU General Public License
 # along with ISLa.  If not, see <http://www.gnu.org/licenses/>.
 
-__version__ = "1.14.2"
+__version__ = "1.14.4"