Merge remote-tracking branch 'origin/master' into sadhiin/python-linkedlist

Hacktoberfest2024 contribution with updated/solved issue with github
action.

Author: sadhiin

.github/workflows/publish-to-test-pypi.yml

@@ -9,9 +9,15 @@ jobs:
     steps:
     - uses: actions/checkout@master
     - name: Set up Python 3.9
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v3
       with:
         python-version: "3.9"
+    - name: Update pip
+      run: python -m pip install --upgrade pip
+    - name: Install dependencies
+      run: |
+          pip install -r requirements.txt
+          pip install .
     - name: Install pypa/build
       run: >-
         python -m

.github/workflows/run_black_and_isort.yml

@@ -20,10 +20,12 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
+            pip install --upgrade pip
+            pip install -r requirements.txt
             pip install .
             pip install black isort
       - name: Run black and isort
         run: |
             python -m black easyPythonpi/*
             python -m isort easyPythonpi/*
-            
+

.github/workflows/run_tests.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
         os: [ubuntu-latest, macos-latest]
     steps:
       - uses: actions/checkout@v3
@@ -21,6 +21,8 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
+            pip install --upgrade pip
+            pip install -r requirements.txt
             pip install .
             pip install regex
       - name: Run tests

.gitignore

@@ -1,6 +1,168 @@
-# prevents all pycaches from being added 
+# prevents all pycaches from being added
 __pycache__
 easyPythonpi/__pycache__
 build
 dist
-easyPythonpi.egg.info
+easyPythonpi.egg.info
+
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#pdm.lock
+#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
+#   in version control.
+#   https://pdm.fming.dev/latest/usage/project/#working-with-version-control
+.pdm.toml
+.pdm-python
+.pdm-build/
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+#.idea/

requirements.txt

@@ -0,0 +1,2 @@
+numpy >= 1.19.5
+requests >= 2.25.1

setup.py

@@ -3,14 +3,65 @@
 import codecs
 import os
 
+try:
+    import requests
+    requests_installed = True
+except ImportError:
+    requests_installed = False
+
 #VERSION = '0.0.1'
-VERSION = (
-    subprocess.run(["git", "describe", "--tags"], stdout=subprocess.PIPE)
-    .stdout.decode("utf-8")
-    .strip()
-)
+# VERSION = (
+#     subprocess.run(["git", "describe", "--tags"], stdout=subprocess.PIPE)
+#     .stdout.decode("utf-8")
+#     .strip()
+# )
+
+def get_pypi_version():
+    if not requests_installed:
+        print("Warning: 'requests' module is not installed. Using default version.")
+        return "0.0.1"
+    try:
+        response = requests.get("https://pypi.org/pypi/easyPythonpi/json")
+        data = response.json()
+        return str(data["info"]["version"])
+    except Exception as e:
+        print(f"Error fetching version from PyPI: {e}")
+        return "0.0.1"
+
+def increment_version(version):
+    major, minor, patch = map(int, version.split('.'))
+    patch += 1
+    if patch > 9:
+        patch = 0
+        minor += 1
+    if minor > 9:
+        minor = 0
+        major += 1
+    return f"{major}.{minor}.{patch}"
+
+def get_version():
+    pypi_version = get_pypi_version()
+    new_version = increment_version(pypi_version)
+
+    try:
+        git_describe = subprocess.run(["git", "describe", "--tags"], stdout=subprocess.PIPE, stderr=subprocess.PIPE, check=True)
+        git_version = git_describe.stdout.decode("utf-8").strip()
+
+        if "-" in git_version:
+            v, i, s = git_version.split("-")
+            git_version = f"{new_version}+{i}.git.{s}"
+        else:
+            git_version = new_version
+    except subprocess.CalledProcessError:
+        git_version = new_version
+
+    return git_version
+
+VERSION = get_version()
+
+print("Version: ", VERSION)
 
-if "-" in VERSION:
+if VERSION and "-" in VERSION:
     # when not on tag, git describe outputs: "1.3.3-22-gdf81228"
     # pip has gotten strict with version numbers
     # so change it to: "1.3.3+22.git.gdf81228"
@@ -39,7 +90,8 @@
     description=DESCRIPTION,
     long_description_content_type="text/markdown",
     packages=find_packages(),
-    install_requires=["numpy >= 1.19.5"],
+    install_requires=["numpy >= 1.19.5"] + (["requests >= 2.25.1"] if not requests_installed else []),
+    setup_requires=["requests >= 2.25.1"],
     keywords=['python', 'sorting', 'beginners', 'sockets'],
     classifiers=[
         "Development Status :: 1 - Planning",