Merge pull request #24 from Safe/FMEENGINE-79104

Add wheel as dependency; update all dependencies; require Python >= 3.7

.github/workflows/release-pypi.yml

@@ -0,0 +1,23 @@
+name: Build and release wheel to PyPI
+on:
+  release:
+    types: [created]
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.x'
+    - name: Install
+      run: pip install .[dev]
+    - name: Run tests
+      run: pytest
+    - name: Build
+      run: python -m build
+    - name: Release to PyPI
+      uses: pypa/gh-action-pypi-publish@release/v1

CHANGES.md

@@ -1,5 +1,10 @@
 # fme-packager changes
 
+# 1.5.0
+
+* Require Python 3.7 or newer.
+* Update dependencies.
+
 # 1.4.4
 
 * Improve help validation for packages with hyphenated UIDs.

fme_packager/__init__.py

@@ -1 +1 @@
-__version__ = "1.4.4"
+__version__ = "1.5.0"

fme_packager/packager.py

@@ -208,7 +208,7 @@ def apply_help(self, help_src):
             with open(flali_path, encoding="utf-8") as xmlin:
                 aliases_xml = xmltodict.parse(xmlin.read())
 
-            embedded_doc_dirs = list(filter(lambda x: x.startswith("!"), os.listdir(help_src)))
+            embedded_doc_dirs = [x for x in os.listdir(help_src) if x.startswith("!")]
             if embedded_doc_dirs:
                 warnings.warn(
                     "{} embedded doc folders (starting with '!'). Avoid these if possible".format(

pyproject.toml

@@ -1,7 +1,6 @@
 [build-system]
 requires = [
-    "setuptools>=45.2",
-    "wheel"
+    "setuptools",
 ]
 build-backend = "setuptools.build_meta"
 

setup.cfg

@@ -8,10 +8,8 @@ long_description_content_type = text/markdown
 keywords = FME fmeobjects
 url = https://github.com/safesoftware/fme-packager
 license = BSD
-license_file = LICENSE
 classifiers =
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
@@ -23,27 +21,25 @@ classifiers =
 [options]
 packages = fme_packager
 include_package_data = True
-python_requires = >=3.6
+python_requires = >=3.7
 install_requires =
-    click~=8.0.0
-    cookiecutter~=1.7.2
-    defusedxml~=0.6.0
-    jsonschema~=3.2.0
-    pypng~=0.0.20
-    ruamel.yaml~=0.16.10
-    xmltodict~=0.12.0
-    packaging~=21.0
-    build~=0.7.0
-    setuptools>=45.2.0
-    markdown>=3.3.0
+    click>=8.1.6
+    cookiecutter>=2.2.3
+    jsonschema>=4.17.3
+    pypng>=0.20220715.0
+    ruamel.yaml>=0.17.32
+    xmltodict>=0.13.0
+    packaging>=23.1
+    build>=0.10.0
+    wheel>=0.40.0
+    setuptools>=68.0.0
+    markdown>=3.4.3
 
 [options.extras_require]
 dev =
-    pipenv
     pytest
     black
-    tox
-    twine
+    tox>=4.6.4
     urllib3<2
 
 [options.entry_points]

tox.ini

@@ -1,7 +1,7 @@
 [tox]
 requires =
-    tox>=4
-env_list = py{36,310,311}
+    tox>=4.6.4
+env_list = py{37,38,39,310,311}
 
 [testenv]
 description = run tests