Merge pull request #32 from Safe/cib-fixes

Fix Python 3.8 support; various misc fixes and improvements

.gitignore

@@ -65,6 +65,7 @@ instance/
 
 # Sphinx documentation
 docs/_build/
+_build/
 
 # PyBuilder
 target/

CHANGES.md

@@ -1,5 +1,9 @@
 # fmetools changes
 
+## 0.9.4
+
+* Fix support for Python 3.8 and require Python 3.8+.
+
 ## 0.9.3
 
 * Update docstrings for FMEEnhancedTransformer and FMEBaseTransformer.

fme_env.py

@@ -1,6 +1,7 @@
 """
 A CLI script to set up a virtualenv to work with FME.
 """
+
 import os
 import argparse
 import shutil
@@ -31,7 +32,9 @@
         raise ValueError("Couldn't find " + site_packages_dir)
 
     if not args.fme_home:
-        raise ValueError("FME_HOME environment variable not defined, so --fme-home must be given")
+        raise ValueError(
+            "FME_HOME environment variable not defined, so --fme-home must be given"
+        )
     print("Using FME install dir: " + args.fme_home)
     if not os.path.isdir(args.fme_home):
         raise ValueError("FME_HOME is not a directory")

pyproject.toml

@@ -4,3 +4,9 @@ addopts = "-s"
 testpaths = [
     "tests",
 ]
+
+[tool.ruff]
+required-version = '>=0.5.1'
+target-version = 'py38'
+[tool.ruff.lint]
+extend-select = ["FA"]

requirements.txt

@@ -1,5 +1,6 @@
-build
-pytest
-pytest-vcr
-hypothesis
-ruff
+build==1.2.1
+pytest>=8.2.2
+pytest-cov>=5.0.0
+pytest-vcr==1.0.2
+hypothesis==6.105.1
+ruff==0.5.1

setup.cfg

@@ -1,43 +1,35 @@
-[metadata]
-name = fmetools
-version = attr: fmetools.__version__
-author = Safe Software Inc.
-description = Tools for extending Safe Software's FME using Python.
-long_description = file: README.md, CHANGES.md
-long_description_content_type = text/markdown
-keywords = FME fmeobjects
-url = https://github.com/safesoftware/fmetools
-project_urls =
-    Documentation = https://docs.safe.com/fme/html/fmetools/
-license = BSD
-license_file = LICENSE
-classifiers =
-    Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.7
-    Programming Language :: Python :: 3.8
-    Programming Language :: Python :: 3.9
-    Programming Language :: Python :: 3.10
-    Programming Language :: Python :: 3.11
-    License :: OSI Approved :: BSD License
-    Intended Audience :: Developers
-
-[options]
-package_dir =
-    =src
-packages = find:
-python_requires = >=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*
-include_package_data = True
-
-[options.packages.find]
-where=src
-
-[options.extras_require]
-dev =
-    ruff>=0.1.5
-    pytest
-    hypothesis
-    sphinx>=6.0.0
-    sphinx-rtd-theme>=1.2.2
-
-[bdist_wheel]
-universal=1
+[metadata]
+name = fmetools
+version = attr: fmetools.__version__
+author = Safe Software Inc.
+description = Tools for extending Safe Software's FME using Python.
+long_description = file: README.md, CHANGES.md
+long_description_content_type = text/markdown
+keywords = FME fmeobjects
+url = https://github.com/safesoftware/fmetools
+project_urls =
+    Documentation = https://docs.safe.com/fme/html/fmetools/
+license = BSD
+license_file = LICENSE
+classifiers =
+    Programming Language :: Python :: 3
+    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 :: BSD License
+    Intended Audience :: Developers
+
+[options]
+package_dir =
+    =src
+packages = find:
+python_requires = >=3.8.0
+include_package_data = True
+
+[options.packages.find]
+where=src
+
+[bdist_wheel]
+universal=1

src/fmetools/__init__.py

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-__version__ = "0.9.3"
+__version__ = "0.9.4"
 
 import gettext
 import os

src/fmetools/features.py

@@ -5,6 +5,7 @@
 These utilities make it more convenient to work with FMEFeature objects,
 and help avoid common errors.
 """
+
 from __future__ import annotations
 
 from typing import Any, Iterable, Optional

src/fmetools/guiparams.py

@@ -11,6 +11,9 @@
     This module is made available to provide a migration path for existing transformers and advanced use cases.
     Most developers should instead use FMXJ transformer definitions and :mod:`fmetools.paramparsing`.
 """
+
+from __future__ import annotations
+
 from collections import namedtuple
 from typing import Any, Mapping, Union
 

src/fmetools/http.py

@@ -5,6 +5,8 @@
 a drop-in replacement for :class:`requests.Session`.
 Use this class to make HTTP requests that automatically follow FME settings.
 """
+
+from __future__ import annotations
 import json
 import logging
 import os

src/fmetools/localize.py

@@ -2,6 +2,7 @@
 """
 Helpers for enabling localized strings using the :mod:`gettext` module.
 """
+
 from __future__ import annotations
 
 import os

src/fmetools/logfile.py

@@ -6,6 +6,9 @@
 Developers should not need to directly use anything in this module,
 as the base classes in :mod:`.plugins` include preconfigured loggers.
 """
+
+from __future__ import annotations
+
 import logging
 from typing import Optional
 

src/fmetools/paramparsing.py

@@ -11,6 +11,7 @@
     Packages using this module and targeting both FME Form and FME Flow
     should set ``minimum_fme_build`` in its package.yml accordingly.
 """
+
 from __future__ import annotations
 
 from typing import Any, Iterable, Optional, Union

src/fmetools/parsers.py

@@ -3,12 +3,13 @@
 This module contains parsers to support FME reader/writer development.
 It is not intended for general use.
 """
+
 from collections import OrderedDict, namedtuple
 
 import fme
 import six
-from fmeobjects import FMEFeature, FMESession
-from pluginbuilder import FMEMappingFile
+from fmeobjects import FMEFeature, FMESession  # noqa F401
+from pluginbuilder import FMEMappingFile  # noqa F401
 from six import string_types
 
 from .utils import string_to_bool

src/fmetools/plugins.py

@@ -6,6 +6,9 @@
 :class:`FMEEnhancedTransformer` is the recommended base class for transformers.
 Transformer developers should subclass it to implement their own transformers.
 """
+
+from __future__ import annotations
+
 import logging
 import warnings
 from typing import Optional

src/fmetools/scripted_selection.py

@@ -17,6 +17,9 @@
   which includes a reference to the :class:`ScriptedSelectionCallback` implementation above,
   and other configuration, such as Input Parameters, search support, and more.
 """
+
+from __future__ import annotations
+
 from abc import ABC, abstractmethod
 from typing import Any, Dict, List, Optional
 

src/fmetools/webservices.py

@@ -2,6 +2,7 @@
 """
 Helpers for working with FME Named Connections and FME Web Services.
 """
+
 from __future__ import annotations
 
 from typing import Union

tests/conftest.py

@@ -1,4 +1,6 @@
-# coding: utf-8
+# Import these modules just for parsing coverage.
+# Remove when these modules get imported elsewhere for tests.
+from fmetools import localize, scripted_selection, webservices  # noqa F401
 
 import json
 

tests/test_features.py

@@ -101,7 +101,9 @@ def test_set_and_get_attributes(attrs):
 
 
 def test_build_feature():
-    f = build_feature("feattype", attrs={"foo": "bar"}, geometry=FMEPoint(1, 1, 1), coordsys="LL84")
+    f = build_feature(
+        "feattype", attrs={"foo": "bar"}, geometry=FMEPoint(1, 1, 1), coordsys="LL84"
+    )
     assert not f.getSequencedAttributeNames()
     assert f.getFeatureType() == "feattype"
     assert isinstance(f.getGeometry(), FMEPoint)

tests/test_fmehttp.py

@@ -146,7 +146,7 @@ def test_generalproxyhandler_use_system_proxy_flag(value):
     mockSession = MockFMESession(["use-system-proxy", value])
     handler = FMEGeneralProxyHandler()
     handler.configure(mockSession)
-    assert handler.use_pac == (value is "yes")
+    assert handler.use_pac == (value == "yes")
 
 
 @pytest.mark.parametrize(

tests/test_paramparsing.py

@@ -19,7 +19,7 @@
 
 @pytest.fixture
 def creator():
-    return TransformerParameterParser("Creator")
+    return TransformerParameterParser("Creator", version=6)
 
 
 def test_system_transformer(creator):

tox.ini

@@ -0,0 +1,38 @@
+[tox]
+envlist = py{38,39,310,311,312}
+min_version = 4.16.0
+package = editable
+
+[testenv]
+passenv =
+    FME_HOME
+deps =
+    pytest>=8.2.2
+    pytest-cov>=5.0.0
+    pytest-vcr>=1.0.2
+    hypothesis>=6.105.1
+    fme-packager>=1.6.0
+commands =
+    fme-packager config-env --fme-home '{env:FME_HOME}'
+    pytest --junitxml test-reports/junit-{envname}.xml --junit-prefix={envname} --cov --cov-append --cov-report xml {posargs}
+
+[testenv:format]
+deps =
+    ruff>=0.3.2
+skip_install = true
+commands =
+    ruff format --check
+
+[testenv:check]
+deps =
+    ruff>=0.3.2
+skip_install = true
+commands =
+    ruff check
+
+[testenv:docs]
+deps =
+    sphinx>=6.0.0
+    sphinx-rtd-theme>=1.2.2
+commands =
+    sphinx-build docs _build