Merge pull request #89 from AlexandreSenpai/chore/pyproject-uv-migration

Updating github actions

Author: AlexandreSenpai

.github/workflows/dev-pypi.yml

@@ -1,11 +1,13 @@
-name: Development Pypi
+name: Development PyPI
+
 on:
   push:
     tags:
       - "*-*"
+
 jobs:
   testing-deploy:
-    name: Pypi
+    name: PyPI
     runs-on: ubuntu-latest
     environment:
       name: pypi
@@ -14,39 +16,44 @@ jobs:
       id-token: write
 
     steps:
-      - uses: actions/checkout@v2
+      - name: Check out repository
+        uses: actions/checkout@v3
 
       - name: Set up Python
-        uses: actions/setup-python@master
+        uses: actions/setup-python@v4
         with:
           python-version: 3.9
 
-      - name: Preparing the environment
+      - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          if [ -f requirements.txt ]; then python -m pip install -r requirements.txt; else python -m pip install beautifulsoup4 requests pydantic expiringdict pytest; fi
+          python -m pip install pip-tools
+          pip install hatch pytest pytest-cov
+          pip-compile pyproject.toml -o requirements-build.txt --all-extras
+          pip install -r requirements-build.txt
 
-      - name: Starting Testing Suites
+      - name: Run tests
         run: |
-          ENMA_CACHING_STATE=disabled \
-          pytest ./tests
+          ENMA_CACHING_STATE=disabled hatch run pytest
 
-      - name: Upload Report to Codecov
-        uses: codecov/codecov-action@v1
+      - name: Upload coverage report to Codecov
+        uses: codecov/codecov-action@v3
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          file: ./coverage.xml
+          files: ./coverage.xml
           flags: pytest
 
-      - name: Building and Deploying
+      - name: Build the package
         run: |
-          python -m pip install build twine wheel setuptools_scm setuptools
-          python -m build
+          hatch build
 
       - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@v1.8.14
+        uses: pypa/gh-action-pypi-publish@release/v1
         with:
           repository-url: https://test.pypi.org/legacy/
           user: __token__
           password: ${{ secrets.DEV_PYPI_API_TOKEN }}
-          packages_dir: dist/
+          packages-dir: dist/
+          verify-metadata: false
+          attestations: false
+          verbose: true

.github/workflows/pypi.yml

@@ -7,40 +7,50 @@ jobs:
   production-deploy:
     name: Pypi
     runs-on: ubuntu-latest
+    environment:
+      name: pypi
+      url: https://pypi.org/p/enma
+    permissions:
+      id-token: write
     if: "!contains(github.ref, '-')"
+
     steps:
-      - uses: actions/checkout@v2
+      - name: Check out repository
+        uses: actions/checkout@v3
 
       - name: Set up Python
-        uses: actions/setup-python@master
+        uses: actions/setup-python@v4
         with:
           python-version: 3.9
 
       - name: Preparing the Environment
         run: |
           python -m pip install --upgrade pip
-          if [ -f requirements.txt ]; then python -m pip install -r requirements.txt; else python -m pip install beautifulsoup4 requests pydantic expiringdict pytest; fi
+          python -m pip install pip-tools
+          pip install hatch pytest pytest-cov
+          pip-compile pyproject.toml -o requirements-build.txt --all-extras
+          pip install -r requirements-build.txt
   
       - name: Starting Testing Suites
         run: |
           ENMA_CACHING_STATE=disabled \
-          pytest ./tests
+          hatch run pytest ./tests
 
       - name: Upload Report to Codecov
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v3
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           file: ./coverage.xml
           flags: pytest
 
       - name: Building and Deploying
         run: |
-          python -m pip install build twine wheel setuptools_scm setuptools
-          python -m build
+          hatch build
 
       - name: Publish a Python distribution to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           user: __token__
           password: ${{ secrets.PYPI_API_TOKEN }}
-          packages_dir: dist/
+          packages-dir: dist/
+          verify-metadata: false

.github/workflows/testing.yml

@@ -24,15 +24,18 @@ jobs:
       - name: Preparing the environment
         run: |
           python -m pip install --upgrade pip
-          if [ -f requirements.txt ]; then python -m pip install -r requirements.txt; else python -m pip install beautifulsoup4 requests pydantic expiringdict pytest pytest-cov; fi
+          python -m pip install pip-tools
+          pip install pytest pytest-cov
+          pip-compile pyproject.toml -o requirements-build.txt --all-extras
+          pip install -r requirements-build.txt
 
       - name: Starting Testing Suites
         run: |
           ENMA_CACHING_STATE=disabled \
           pytest --cov=. --cov-report=xml ./tests
 
       - name: Upload Report to Codecov
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v3
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           file: ./coverage.xml

enma/_version.py

@@ -12,5 +12,5 @@
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.4.5.dev0+gc9b40af.d20250111'
-__version_tuple__ = version_tuple = (2, 4, 5, 'dev0', 'gc9b40af.d20250111')
+__version__ = version = '2.4.4'
+__version_tuple__ = version_tuple = (2, 4, 4)

pyproject.toml

@@ -13,16 +13,6 @@ classifiers = [
 ]
 dynamic = ["version"]
 
-[project.urls]
-"Github" = "https://github.com/AlexandreSenpai/Enma"
-
-[project.optional-dependencies]
-google_drive = [
-  "google-api-python-client>=2.0.0",
-  "google-auth-httplib2>=0.1.0",
-  "google-auth-oauthlib>=0.4.0",
-]
-
 dependencies = [
     "beautifulsoup4==4.12.3",
     "expiringdict==1.2.2",
@@ -36,6 +26,17 @@ dev = [
     "pytest==8.3.2",
 ]
 
+[project.optional-dependencies]
+google_drive = [
+  "google-api-python-client>=2.0.0",
+  "google-auth-httplib2>=0.1.0",
+  "google-auth-oauthlib>=0.4.0",
+]
+
+[project.urls]
+"Github" = "https://github.com/AlexandreSenpai/Enma"
+"Documentation" = "https://docs.minorin.io/enma"
+
 [build-system]
 requires = ["hatchling", "hatch-vcs"]
 build-backend = "hatchling.build"
@@ -60,6 +61,9 @@ source = "vcs"
 [tool.hatch.build.hooks.vcs]
 version-file = "enma/_version.py"
 
+[tool.hatch.version.raw-options]
+local_scheme = "no-local-version"
+
 [tool.coverage.run]
 omit = [
   "*/interfaces/*",

requirements.txt

@@ -1,9 +1,82 @@
-requests==2.32.3
+#
+# This file is autogenerated by pip-compile with Python 3.9
+# by the following command:
+#
+#    pip-compile --all-extras --output-file=requirements.txt pyproject.toml
+#
+annotated-types==0.7.0
+    # via pydantic
 beautifulsoup4==4.12.3
-pydantic==2.8.2
-pytest==8.3.2
+    # via enma (pyproject.toml)
+cachetools==5.5.0
+    # via google-auth
+certifi==2024.12.14
+    # via requests
+charset-normalizer==3.4.1
+    # via requests
 expiringdict==1.2.2
-pytest-cov==4.1.0
-google-api-python-client>=2.0.0
-google-auth-httplib2>=0.1.0
-google-auth-oauthlib>=0.4.0
+    # via enma (pyproject.toml)
+google-api-core==2.24.0
+    # via google-api-python-client
+google-api-python-client==2.158.0
+    # via enma (pyproject.toml)
+google-auth==2.37.0
+    # via
+    #   google-api-core
+    #   google-api-python-client
+    #   google-auth-httplib2
+    #   google-auth-oauthlib
+google-auth-httplib2==0.2.0
+    # via
+    #   enma (pyproject.toml)
+    #   google-api-python-client
+google-auth-oauthlib==1.2.1
+    # via enma (pyproject.toml)
+googleapis-common-protos==1.66.0
+    # via google-api-core
+httplib2==0.22.0
+    # via
+    #   google-api-python-client
+    #   google-auth-httplib2
+idna==3.10
+    # via requests
+oauthlib==3.2.2
+    # via requests-oauthlib
+proto-plus==1.25.0
+    # via google-api-core
+protobuf==5.29.3
+    # via
+    #   google-api-core
+    #   googleapis-common-protos
+    #   proto-plus
+pyasn1==0.6.1
+    # via
+    #   pyasn1-modules
+    #   rsa
+pyasn1-modules==0.4.1
+    # via google-auth
+pydantic==2.8.2
+    # via enma (pyproject.toml)
+pydantic-core==2.20.1
+    # via pydantic
+pyparsing==3.2.1
+    # via httplib2
+requests==2.32.3
+    # via
+    #   enma (pyproject.toml)
+    #   google-api-core
+    #   requests-oauthlib
+requests-oauthlib==2.0.0
+    # via google-auth-oauthlib
+rsa==4.9
+    # via google-auth
+soupsieve==2.6
+    # via beautifulsoup4
+typing-extensions==4.12.2
+    # via
+    #   pydantic
+    #   pydantic-core
+uritemplate==4.1.1
+    # via google-api-python-client
+urllib3==2.3.0
+    # via requests