From 65d845a2767372ad14d2ce9306eff0d7cfe70840 Mon Sep 17 00:00:00 2001 From: Facundo Batista Date: Wed, 17 Jul 2024 17:52:55 -0300 Subject: [PATCH 1/2] Removed last traces of Python2. --- man/fades.1 | 18 +++++++++--------- setup.py | 15 --------------- 2 files changed, 9 insertions(+), 24 deletions(-) diff --git a/man/fades.1 b/man/fades.1 index 410b6d3..9f09fdc 100644 --- a/man/fades.1 +++ b/man/fades.1 @@ -82,7 +82,7 @@ Read the dependencies from a file. Format in each line is the same than dependen .TP .BR -p " " \fIversion\fR ", " --python=\fIversion\fR -Select which Python version to be used; the argument can be just the number (2.7), the whole name (python2.7) or the whole path (/usr/bin/python2.7). Of course, the corresponding version of Python needs to be installed in your system. +Select which Python version to be used; the argument can be just the number (3.9), the whole name (python3.9) or the whole path (/usr/bin/python3.9). Of course, the corresponding version of Python needs to be installed in your system. The dependencies can be indicated in multiple places (in the Python source file, with a comment besides the import, in a \fIrequirements\fRfile, and/or through command line. In case of multiple definitions of the same dependency, command line overrides everything else, and requirements file overrides what is specified in the source code. @@ -96,13 +96,13 @@ Remove a virtual environment by UUID. See \fB--get-venv-dir\fR option to easily .TP .BR --system-site-packages "" -Give the virtual environment access to thesystem site-packages dir +Give the virtual environment access to thesystem site-packages dir -.TP +.TP .BR --venv-options=\fIVIRTUALENV_OPTION\fR Extra options to be supplied to the venv module (this option can be used multiple times) -.TP +.TP .BR --pip-options=\fIPIP_OPTION\fR Extra options to be supplied to pip. (this option can be used multiple times) @@ -110,7 +110,7 @@ Extra options to be supplied to pip. (this option can be used multiple times) .BR --python-options=\fIPYTHON_OPTION\fR Extra options to be supplied to python. (this option can be used multiple times) -.TP +.TP .BR -U ", " --check-updates Will check for updates in PyPI to verify if there are new versions for the requested dependencies. If a new version is available for a dependency, it will use it (if the dependency was requested without version) or just inform which new version is available (if the dependency was requested with a specific version). @@ -177,13 +177,13 @@ Executes the Python interactive interpreter in a virtual environment after insta .SH USING CONFIGURATION FILES -You can also configure fades using \fB.ini\fR config files. fades will search config files in -\fB/etc/fades/fades.ini\fR, the path indicated by \fBxdg\fR for your system -(for example ~/config/fades/fades.ini) and .fades.ini. +You can also configure fades using \fB.ini\fR config files. fades will search config files in +\fB/etc/fades/fades.ini\fR, the path indicated by \fBxdg\fR for your system +(for example ~/config/fades/fades.ini) and .fades.ini. So you can have different settings at system, user and project level. The config files are in .ini format. (configparser) and fades will search for a [fades] section. -You have to use the same configurations that in the CLI. The only difference is with the config +You have to use the same configurations that in the CLI. The only difference is with the config options with a dash, it has to be replaced with a underscore. Check http://fades.readthedocs.org/en/latest/readme.html#setting-options-using-config-files for full examples. diff --git a/setup.py b/setup.py index ba1125e..b5ee8fb 100755 --- a/setup.py +++ b/setup.py @@ -28,25 +28,10 @@ import re import shutil import sys -import zlib from distutils.core import setup from setuptools.command.install import install -_PY2_MESSAGE = ( - b"x\x9c\xb5QA\x0e\x800\x08\xbb\xf3\nnjb\xb2\x0f-\xc1\x87\xec\xf1\x0e\xda\xe1f\xbc\xca2\x02\xa5" - b"Ep\xa2j\xddt2\x9b\xfc\x97\xbd\xf9\x9f\x9cW\x9c\xb9h\xf3\xac>x\xd3Fo\xa3=T\xcc\x9b\x03U\x13" - b"\xcb:\xafe\x0f\xa8{\xac\xbb\x1d,I\xd4\x0e\xf7y\xc0\xd9\xd0\xb5`\x9a\xccC\xe7|b\xd7\xa8" - b"\xe3\x14\xaa\xddC}\xb1\x82N\xd8\xcf\nf\xa2\xcat\xfa\xfa\xbeL\x83\x1e\xce\xd7e\xc6" - b"\xa1\xae\xb1\xfc\xd8\xcf\xd5\x93\xb6\xeb$xa\x9dz:ZcB^\xcfb\x9a\x91\xc7\xff4F+" - b"\xef\x8c8\xe8\x95\xfb%\xcaNM\x9ew%\xf5G\x93\x1bF\xf1\x97\x0f") - -# forbid the installation in a python2 environment -if sys.version_info.major < 3: - print(zlib.decompress(_PY2_MESSAGE).decode('ascii')) - print("fades is a python3 only project, sorry!\n") - raise ValueError("fades is a python3 only project, sorry!") - def get_version(): """Retrieves package version from the file.""" From 9a342694dfa157a2c0e84cf2fd146e9548ae8512 Mon Sep 17 00:00:00 2001 From: Facundo Batista Date: Wed, 17 Jul 2024 18:21:02 -0300 Subject: [PATCH 2/2] Replated macos11 with 13. --- .github/workflows/tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 616382b..dfb00be 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -13,7 +13,7 @@ jobs: run-tests: strategy: matrix: - os: [ubuntu-20.04, ubuntu-22.04, macos-12, macos-11, windows-2019, windows-2022] + os: [ubuntu-20.04, ubuntu-22.04, macos-12, macos-13, windows-2019, windows-2022] python-version: [3.8, 3.9, "3.10", "3.11", "3.12"] runs-on: ${{ matrix.os }}