Merge with dev

barseghyanartur · Nov 15, 2024 · 6c2fa3b · 6c2fa3b
2 parents e082323 + 2316225
commit 6c2fa3b
Show file tree

Hide file tree

Showing 83 changed files with 756 additions and 2,689 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -25,17 +25,17 @@ jobs:
 #          - "3.8"
 #          - "3.7"
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 #          cache: 'pip'
 #          cache-dependency-path: '**/setup.py'
       - name: Install detect-secrets
         run: pip install --no-cache-dir detect-secrets doc8 isort==5.11.5
       - name: Run pre-commit
-        uses: pre-commit/action@v3.0.0
+        uses: pre-commit/action@v3.0.1
 
   # *************************************
   # *********** Additional tests ********
@@ -63,9 +63,9 @@ jobs:
         run: sudo apt-get update && sudo apt-get install -y wkhtmltopdf libpango-1.0-0 libharfbuzz0b libpangoft2-1.0-0 poppler-utils
       - name: Clean-up
         run: sudo apt clean && sudo apt autoclean && sudo rm -rf /tmp/* && sudo rm -rf /usr/share/dotnet && sudo rm -rf /opt/ghc && sudo rm -rf "/usr/local/share/boost" && sudo rm -rf "$AGENT_TOOLSDIRECTORY"
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 #          cache: 'pip'
@@ -109,9 +109,9 @@ jobs:
         run: sudo apt-get update && sudo apt-get install -y wkhtmltopdf libpango-1.0-0 libharfbuzz0b libpangoft2-1.0-0 poppler-utils
       - name: Clean-up
         run: sudo apt clean && sudo apt autoclean && sudo rm -rf /tmp/* && sudo rm -rf /usr/share/dotnet && sudo rm -rf /opt/ghc && sudo rm -rf "/usr/local/share/boost" && sudo rm -rf "$AGENT_TOOLSDIRECTORY"
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 #          cache: 'pip'
@@ -172,9 +172,9 @@ jobs:
       run: sudo apt-get update && sudo apt-get install -y wkhtmltopdf libpango-1.0-0 libharfbuzz0b libpangoft2-1.0-0 poppler-utils
     - name: Clean-up
       run: sudo apt clean && sudo apt autoclean && sudo rm -rf /tmp/* && sudo rm -rf /usr/share/dotnet && sudo rm -rf /opt/ghc && sudo rm -rf "/usr/local/share/boost" && sudo rm -rf "$AGENT_TOOLSDIRECTORY"
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
 #        cache: 'pip'

diff --git a/.gitignore b/.gitignore
@@ -26,6 +26,7 @@ codebin/
 /examples/tmp/
 /examples/logs/
 /builddocs/
+/docs/_build/
 /builddocs.zip
 /build/
 /dist/

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,5 +1,5 @@
 exclude: "^docs/|/migrations/"
-default_stages: [ commit, push ]
+default_stages: [ pre-commit, pre-push ]
 default_language_version:
   python: python3
 
@@ -20,7 +20,7 @@ repos:
         args: []
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: trailing-whitespace
         exclude: "data/"
@@ -32,29 +32,29 @@ repos:
       - id: debug-statements
       - id: check-merge-conflict
 
-  - repo: https://github.com/psf/black
-    rev: 24.4.2
-    hooks:
-      - id: black
-        name: black
-        files: .
-        args: [ "--config", "pyproject.toml" ]
+#  - repo: https://github.com/psf/black
+#    rev: 24.4.2
+#    hooks:
+#      - id: black
+#        name: black
+#        files: .
+#        args: [ "--config", "pyproject.toml" ]
 
-  - repo: https://github.com/pycqa/isort
-    rev: 5.13.2
-    hooks:
-      - id: isort
-        name: isort
-        files: .
-        args: [ "--settings-path", "pyproject.toml", "--profile=black" ]
+#  - repo: https://github.com/pycqa/isort
+#    rev: 5.13.2
+#    hooks:
+#      - id: isort
+#        name: isort
+#        files: .
+#        args: [ "--settings-path", "pyproject.toml", "--profile=black" ]
 
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.4.4
+    rev: v0.7.3
     hooks:
       - id: ruff
         name: lint
         files: .
-        args: [ "--config", "pyproject.toml" ]
+        args: [ "--config", "pyproject.toml", "--fix" ]
 
 #  - repo: https://github.com/asottile/pyupgrade
 #    rev: v3.2.0

diff --git a/.secrets.baseline b/.secrets.baseline
@@ -118,14 +118,14 @@
         "filename": "Makefile",
         "hashed_secret": "504a5c3a2ce5fa0acc5f8d9685dc45860c25a8ed",
         "is_verified": true,
-        "line_number": 283
+        "line_number": 134
       },
       {
         "type": "Secret Keyword",
         "filename": "Makefile",
         "hashed_secret": "a3dd3453449ace4d9d2320fa941a909b57c0e846",
         "is_verified": true,
-        "line_number": 286
+        "line_number": 137
       }
     ],
     "README.rst": [
@@ -219,5 +219,5 @@
       }
     ]
   },
-  "generated_at": "2024-09-10T21:44:07Z"
+  "generated_at": "2024-11-14T22:15:37Z"
 }
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -28,6 +28,12 @@ are used for versioning (schema follows below):
   0.3.4 to 0.4).
 - All backwards incompatible changes are mentioned in this document.
 
+0.17.14
+-------
+2024-11-14
+
+- Minor fixes.
+
 0.17.13
 -------
 2024-10-30

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -9,6 +9,7 @@ Contributor guidelines
 .. _doc8: https://doc8.readthedocs.io/
 .. _ruff: https://beta.ruff.rs/docs/
 .. _pip-tools: https://pip-tools.readthedocs.io/
+.. _uv: https://docs.astral.sh/uv/
 .. _issues: https://github.com/barseghyanartur/faker-file/issues
 .. _discussions: https://github.com/barseghyanartur/faker-file/discussions
 .. _pull request: https://github.com/barseghyanartur/faker-file/pulls
@@ -38,23 +39,25 @@ standards.
 
 Code standards
 --------------
-`black`_, `isort`_, `ruff`_ and `doc8`_ will be automatically triggered by
-`pre-commit`_. Still, if you want to run checks manually:
+`ruff`_ and `doc8`_ will be automatically triggered by `pre-commit`_.
+
+`ruff`_ is configured to do the job of `black`_ and `isort`_ as well, so
+all the standards apply.
+
+Still, if you want to run checks manually:
 
 .. code-block:: sh
 
-    ./scripts/black.sh
-    ./scripts/doc8.sh
-    ./scripts/isort.sh
-    ./scripts/ruff.sh
+    make pre-commit
 
 Requirements
 ------------
-Requirements are compiled using `pip-tools`_.
+Requirements are compiled using `uv`_.
 
 .. code-block:: sh
 
-    ./scripts/compile_requirements.sh
+    make compile_requirements
+    make compile_requirements_upgrade
 
 Virtual environment
 -------------------