Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
funilrys committed Sep 22, 2024
2 parents da3c24d + 438663d commit a56915b
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 9 deletions.
19 changes: 17 additions & 2 deletions .github/workflows/stable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
pip install safety
- name: Check the safety of our dependencies.
run: safety check -i 51668 -i 62044 -i 67599
run: safety check -i 51668 -i 62044 -i 67599 -i 70612

test:
needs: [lint, deps_safety_check]
Expand All @@ -85,6 +85,7 @@ jobs:
fail-fast: false
matrix:
python_version:
- "3.8"
- "3.9"
- "3.10"
- "3.11"
Expand Down Expand Up @@ -122,6 +123,7 @@ jobs:
COVERALLS_PARALLEL: true

coveralls:
continue-on-error: true
needs: test
name: Finish Coveralls

Expand Down Expand Up @@ -204,7 +206,7 @@ jobs:

env:
DOCKER_PYTHON_VERSION: "3.12"
BUILDER_CLONE_DIRNAM2: pyfunceble_docker
BUILDER_CLONE_DIRNAME: pyfunceble_docker
OUR_DOCKER_USERNAME: ${{ secrets.OUR_DOCKER_USERNAME }}
OUR_DOCKER_PASSWORD: ${{ secrets.OUR_DOCKER_PASSWORD }}
OUR_DOCKER_EMAIL: ${{ secrets.OUR_DOCKER_EMAIL }}
Expand All @@ -227,12 +229,25 @@ jobs:
- name: Install dependencies
run: |
pip install --upgrade pip
pip install setuptools wheel
pip install ${{ env.BUILDER_CLONE_DIRNAME }}/.
- name: Get version of builder
run: |
pyfunceble-docker-builder --version
- name: Read package name
run: |
python setup.py --name
- name: Read package version
run: |
python setup.py --version
- name: Read commit ID
run: |
git log -1 --format=format:'%H'
- name: Build, Check and Publish 📦
run: >
pyfunceble-docker-builder -b ${{ env.BUILDER_CLONE_DIRNAME }}/builder
Expand Down
2 changes: 1 addition & 1 deletion PyFunceble/cli/scripts/production.py
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ def update_setup_py(self) -> "ProductionPrep":
]
elif self.branch == "master":
regexes = [
(r'name=".*"', 'name="PyFunceble-dev"'),
(r'name=".*"', 'name="PyFunceble"'),
(
r'"Development\sStatus\s::.*"',
'"Development Status :: 5 - Production/Stable"',
Expand Down
2 changes: 1 addition & 1 deletion PyFunceble/cli/storage.py
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@
ERROR: str = f"{colorama.Fore.RED}ERROR"

VERSION_DUMP_LINK: str = (
"https://raw.githubusercontent.com/funilrys/PyFunceble/dev/version.yaml"
"https://raw.githubusercontent.com/funilrys/PyFunceble/master/version.yaml"
)

HASHES_FILENAME: str = "hashes_tracker.json"
Expand Down
2 changes: 1 addition & 1 deletion PyFunceble/storage.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
from PyFunceble.storage_facility import get_config_directory

PROJECT_NAME: str = "PyFunceble"
PROJECT_VERSION: str = "4.2.27.dev (Blue Duckling: Ixora)"
PROJECT_VERSION: str = "4.2.27. (Blue Duckling: Tulip)"

DISTRIBUTED_CONFIGURATION_FILENAME: str = ".PyFunceble_production.yaml"
DISTRIBUTED_DIR_STRUCTURE_FILENAME: str = "dir_structure_production.json"
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ def get_console_scripts(): # pragma: no cover

if __name__ == "__main__":
setuptools.setup(
name="PyFunceble-dev",
name="PyFunceble",
version=get_version(),
python_requires=">=3.8, <4",
install_requires=get_requirements(mode="standard"),
Expand All @@ -271,7 +271,7 @@ def get_console_scripts(): # pragma: no cover
project_urls={
"Documentation": "https://docs.pyfunceble.com",
"Funding": "https://github.com/sponsors/funilrys",
"Source": "https://github.com/funilrys/PyFunceble/tree/dev",
"Source": "https://github.com/funilrys/PyFunceble/tree/master",
"Tracker": "https://github.com/funilrys/PyFunceble/issues",
},
platforms=["any"],
Expand All @@ -288,7 +288,7 @@ def get_console_scripts(): # pragma: no cover
classifiers=[
"Environment :: Console",
"Topic :: Internet",
"Development Status :: 4 - Beta",
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
Expand Down
2 changes: 1 addition & 1 deletion version.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
current_version: '4.2.27.dev (Blue Duckling: Ixora)'
current_version: '4.2.27. (Blue Duckling: Tulip)'
deprecated:
- 3.0.21
- 3.1.20
Expand Down

0 comments on commit a56915b

Please sign in to comment.