Skip to content

Commit 08be07c

Browse files
Merge pull request #438 from PyAr/remove-last-py2-traces
Removed last traces of Python2.
2 parents 13e7039 + 65d845a commit 08be07c

File tree

2 files changed

+9
-24
lines changed

2 files changed

+9
-24
lines changed

man/fades.1

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ Read the dependencies from a file. Format in each line is the same than dependen
8282

8383
.TP
8484
.BR -p " " \fIversion\fR ", " --python=\fIversion\fR
85-
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.
85+
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.
8686

8787
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.
8888

@@ -96,21 +96,21 @@ Remove a virtual environment by UUID. See \fB--get-venv-dir\fR option to easily
9696

9797
.TP
9898
.BR --system-site-packages ""
99-
Give the virtual environment access to thesystem site-packages dir
99+
Give the virtual environment access to thesystem site-packages dir
100100

101-
.TP
101+
.TP
102102
.BR --venv-options=\fIVIRTUALENV_OPTION\fR
103103
Extra options to be supplied to the venv module (this option can be used multiple times)
104104

105-
.TP
105+
.TP
106106
.BR --pip-options=\fIPIP_OPTION\fR
107107
Extra options to be supplied to pip. (this option can be used multiple times)
108108

109109
.TP
110110
.BR --python-options=\fIPYTHON_OPTION\fR
111111
Extra options to be supplied to python. (this option can be used multiple times)
112112

113-
.TP
113+
.TP
114114
.BR -U ", " --check-updates
115115
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).
116116

@@ -177,13 +177,13 @@ Executes the Python interactive interpreter in a virtual environment after insta
177177

178178
.SH USING CONFIGURATION FILES
179179

180-
You can also configure fades using \fB.ini\fR config files. fades will search config files in
181-
\fB/etc/fades/fades.ini\fR, the path indicated by \fBxdg\fR for your system
182-
(for example ~/config/fades/fades.ini) and .fades.ini.
180+
You can also configure fades using \fB.ini\fR config files. fades will search config files in
181+
\fB/etc/fades/fades.ini\fR, the path indicated by \fBxdg\fR for your system
182+
(for example ~/config/fades/fades.ini) and .fades.ini.
183183
So you can have different settings at system, user and project level.
184184

185185
The config files are in .ini format. (configparser) and fades will search for a [fades] section.
186-
You have to use the same configurations that in the CLI. The only difference is with the config
186+
You have to use the same configurations that in the CLI. The only difference is with the config
187187
options with a dash, it has to be replaced with a underscore.
188188

189189
Check http://fades.readthedocs.org/en/latest/readme.html#setting-options-using-config-files for full examples.

setup.py

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,25 +28,10 @@
2828
import re
2929
import shutil
3030
import sys
31-
import zlib
3231

3332
from distutils.core import setup
3433
from setuptools.command.install import install
3534

36-
_PY2_MESSAGE = (
37-
b"x\x9c\xb5QA\x0e\x800\x08\xbb\xf3\nnjb\xb2\x0f-\xc1\x87\xec\xf1\x0e\xda\xe1f\xbc\xca2\x02\xa5"
38-
b"Ep\xa2j\xddt2\x9b\xfc\x97\xbd\xf9\x9f\x9cW\x9c\xb9h\xf3\xac>x\xd3Fo\xa3=T\xcc\x9b\x03U\x13"
39-
b"\xcb:\xafe\x0f\xa8{\xac\xbb\x1d,I\xd4\x0e\xf7y\xc0\xd9\xd0\xb5`\x9a\xccC\xe7|b\xd7\xa8"
40-
b"\xe3\x14\xaa\xddC}\xb1\x82N\xd8\xcf\nf\xa2\xcat\xfa\xfa\xbeL\x83\x1e\xce\xd7e\xc6"
41-
b"\xa1\xae\xb1\xfc\xd8\xcf\xd5\x93\xb6\xeb$xa\x9dz:ZcB^\xcfb\x9a\x91\xc7\xff4F+"
42-
b"\xef\x8c8\xe8\x95\xfb%\xcaNM\x9ew%\xf5G\x93\x1bF\xf1\x97\x0f")
43-
44-
# forbid the installation in a python2 environment
45-
if sys.version_info.major < 3:
46-
print(zlib.decompress(_PY2_MESSAGE).decode('ascii'))
47-
print("fades is a python3 only project, sorry!\n")
48-
raise ValueError("fades is a python3 only project, sorry!")
49-
5035

5136
def get_version():
5237
"""Retrieves package version from the file."""

0 commit comments

Comments
 (0)