update and fmt

Author: CagtayFabry

.github/workflows/test.yml

@@ -8,23 +8,23 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        config_file: ['./test/setup.cfg', './test/pyproject.toml']
+        config_file: [./test/setup.cfg, ./test/pyproject.toml]
     steps:
-      - uses: actions/checkout@v3
-      - name: run local action code
-        uses: ./
-        with:
-          file: ${{ matrix.config_file }}
-          output: 'environment_test.yml'
-          channels: 'conda-forge defaults'
-          extras: 'test pip_only'
-          setup_requires: 'include'
-          pip: 'bidict'
-      - uses: mamba-org/setup-micromamba@v1.4.3
-        with:
-          environment-file: ./environment_test.yml
-          environment-name: demo
-          init-shell: >-
-            bash
-            powershell
-          cache-environment: true
+    - uses: actions/checkout@v3
+    - name: run local action code
+      uses: ./
+      with:
+        file: ${{ matrix.config_file }}
+        output: environment_test.yml
+        channels: conda-forge defaults
+        extras: test pip_only
+        setup_requires: include
+        pip: bidict
+    - uses: mamba-org/setup-micromamba@v1.4.3
+      with:
+        environment-file: ./environment_test.yml
+        environment-name: demo
+        init-shell: >-
+          bash
+          powershell
+        cache-environment: true

.pre-commit-config.yaml

@@ -2,10 +2,10 @@ repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
   rev: v4.1.0
   hooks:
-    - id: trailing-whitespace
-      args: [--markdown-linebreak-ext=md]
-    - id: end-of-file-fixer
-    - id: check-yaml
+  - id: trailing-whitespace
+    args: [--markdown-linebreak-ext=md]
+  - id: end-of-file-fixer
+  - id: check-yaml
   # ----- Python formatting -----
 - repo: https://github.com/charliermarsh/ruff-pre-commit
   rev: v0.1.13
@@ -17,3 +17,17 @@ repos:
     - --fix
       # Run ruff formatter.
   - id: ruff-format
+  # ----- repo maintenance -----
+- repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
+  rev: v2.12.0
+  hooks:
+  - id: pretty-format-yaml
+    args: [--autofix, --indent, '2']
+- repo: https://github.com/tox-dev/pyproject-fmt
+  rev: 1.6.0
+  hooks:
+  - id: pyproject-fmt
+- repo: https://github.com/abravalheri/validate-pyproject
+  rev: v0.15
+  hooks:
+  - id: validate-pyproject

action.yml

@@ -1,22 +1,22 @@
-name: 'pydeps2env'
-description: 'create conda environment file from python project dependencies'
+name: pydeps2env
+description: create conda environment file from python project dependencies
 inputs:
   file:
     description: >-
       Specify the location of the 'setup.cfg' file to parse. (defaults to 'setup.cfg')
     required: true
-    default: 'setup.cfg'
+    default: setup.cfg
   output:
     description: >-
       Specify the location and name of the conda environment file to generate. (defaults to 'environment.yml')
     required: true
-    default: 'environment.yml'
+    default: environment.yml
   channels:
     description: >-
       List the conda channels to include in the environment file. (defaults to 'defaults')
       Separate a list of multiple channels by spaces (e.g. 'conda-forge defaults').
     required: true
-    default: 'defaults'
+    default: defaults
   extras:
     description: >-
       Specify one or more optional [extras_require] sections to add to the environment
@@ -27,24 +27,24 @@ inputs:
       if set to 'include' the dependencies listed under [options]:setup_requires will be added to the environment
       (default is 'omit' so no setup dependencies will be installed)
     required: false
-    default: 'omit'
+    default: omit
   pip:
     description: >-
       List of packages to install via pip instead of conda.
       The dependencies will be listet under the pip section in the environment file.
     required: false
 runs:
-  using: "composite"
+  using: composite
   steps:
-    - name: create environment file
-      run: >
-        pip3 install tomli packaging &&
-        python3 $GITHUB_ACTION_PATH/generate_environment.py ${{ inputs.file }} ${{ inputs.output }}
-        --channels ${{ inputs.channels }}
-        --extras ${{ inputs.extras }}
-        --setup_requires ${{ inputs.setup_requires }}
-        --pip ${{ inputs.pip }}
-      shell: bash
-    - name: show environment file
-      run: cat ${{ inputs.output }}
-      shell: bash
+  - name: create environment file
+    run: >
+      pip3 install tomli packaging pyyaml &&
+      python3 $GITHUB_ACTION_PATH/generate_environment.py ${{ inputs.file }} ${{ inputs.output }}
+      --channels ${{ inputs.channels }}
+      --extras ${{ inputs.extras }}
+      --setup_requires ${{ inputs.setup_requires }}
+      --pip ${{ inputs.pip }}
+    shell: bash
+  - name: show environment file
+    run: cat ${{ inputs.output }}
+    shell: bash

pydeps2env/__init__.py

@@ -8,4 +8,3 @@
     from ._version import __version__
 except ModuleNotFoundError:
     __version__ = ""
-

pydeps2env/environment.py

@@ -77,11 +77,12 @@ def load_pyproject(self):
             for dep in extra_deps:
                 add_requirement(dep, self.requirements)
 
-
     def load_config(self):
         """Load contents from a cfg file (assume setup.cfg layout)."""
         cp = configparser.ConfigParser(
-            converters={"list": lambda x: [i.strip() for i in x.split("\n") if i.strip()]}
+            converters={
+                "list": lambda x: [i.strip() for i in x.split("\n") if i.strip()]
+            }
         )
         cp.read(self.filename)
 

pyproject.toml

@@ -3,7 +3,8 @@ name = "pydeps2env"
 description = "A python helper to generate conda environment files from project dependencies."
 readme = {file = "README.md", content-type="text/markdown"}
 keywords = [
-  "conda", "pyproject",
+  "conda",
+  "pyproject",
 ]
 license = {file = "LICENSE", name="BSD License"}
 authors = [
@@ -28,9 +29,9 @@ dynamic = [
   "version", # version gets derived from git by setuptools_scm.
 ]
 dependencies = [
-  "tomli",
   "packaging",
   "pyyaml",
+  "tomli",
 ]
 [project.optional-dependencies]
 test = [

test/pyproject.toml

@@ -1,27 +1,33 @@
 [project]
 name = "test"
-author = "Cagtay Fabry <cagtay.fabry@bam.de>"
-author_email = "cagtay.fabry@bam.de"
-
 requires-python = ">=3.8,<3.10"
+classifiers = [
+  "Programming Language :: Python :: 3 :: Only",
+  "Programming Language :: Python :: 3.8",
+  "Programming Language :: Python :: 3.9",
+]
 dependencies = [
-    "numpy >=1.20",
-    "pandas >=1.0",
-    "IPython",
-    "boltons",
+  "boltons",
+  "IPython",
+  "numpy>=1.20",
+  "pandas>=1",
 ]
 [project.optional-dependencies]
-test = ["pytest"]
-pip_only = ["bidict"]
-
+pip_only = [
+  "bidict",
+]
+test = [
+  "pytest",
+]
 [project.urls]
 home_page = "https://github.com/CagtayFabry/pydeps2env"
+author = "Cagtay Fabry <cagtay.fabry@bam.de>"
+author_email = "cagtay.fabry@bam.de"
 
-# Build system config, pip creates a temporary env with "requires" pkgs.
 [build-system]
+build-backend = "setuptools.build_meta"
 requires = [
-  "wheel",
-  "setuptools >= 40.9.0",
+  "setuptools>=40.9",
   "setuptools_scm",
+  "wheel",
 ]
-build-backend = "setuptools.build_meta"