Drop python 2 references

With Python 2.x going out of support [1], remove remaining references to
it.

[1] https://www.python.org/dev/peps/pep-0373/

Signed-off-by: Paul Eggleton <bluelightning@bluelightning.org>
This commit is contained in:
Paul Eggleton 2020-03-27 09:19:28 +13:00
parent c9f16d253e
commit f3202c38e6
7 changed files with 9 additions and 16 deletions

View File

@ -21,10 +21,6 @@ RUN apt-get update \
g++ \ g++ \
gcc \ gcc \
make \ make \
python-pip \
python-mysqldb \
python-dev \
python-imaging \
python3-pip \ python3-pip \
python3-mysqldb \ python3-mysqldb \
python3-dev \ python3-dev \
@ -44,11 +40,9 @@ RUN apt-get update \
&& locale-gen en_US.UTF-8 \ && locale-gen en_US.UTF-8 \
&& update-locale \ && update-locale \
&& pip3 install gunicorn \ && pip3 install gunicorn \
&& pip install setuptools \
&& pip3 install setuptools \ && pip3 install setuptools \
&& pip install -r /requirements.txt \
&& pip3 install -r /requirements.txt \ && pip3 install -r /requirements.txt \
&& apt-get purge -y autoconf g++ make python-dev python3-dev libjpeg-dev libmariadbclient-dev \ && apt-get purge -y autoconf g++ make python3-dev libjpeg-dev libmariadbclient-dev \
&& apt-get autoremove -y \ && apt-get autoremove -y \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
&& apt-get clean && apt-get clean

View File

@ -22,9 +22,8 @@ In order to run this application standalone, you will need:
have to have Django installed, have the same or similar configuration have to have Django installed, have the same or similar configuration
in settings.py and have access to the database used by the web in settings.py and have access to the database used by the web
application): application):
* Python 2.7.6+ / Python 3.4+ to match with the version of BitBake * Python 3.4+ to match with the version of BitBake for the OpenEmbedded
for the OpenEmbedded branch being parsed (for modern versions it's branch being parsed.
Python 3.)
* Python dependencies as per requirements.txt (we still need Django * Python dependencies as per requirements.txt (we still need Django
etc. here since we interact with the database through Django's ORM.) etc. here since we interact with the database through Django's ORM.)

View File

@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python3
# layerindex-web - bulk change implementation # layerindex-web - bulk change implementation
# #

View File

@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python3
# Updates site name in Django database # Updates site name in Django database
# #

View File

@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python3
# Update cover info for OE-Classic / other distro recipes in OE layer index database # Update cover info for OE-Classic / other distro recipes in OE layer index database
# #

View File

@ -454,8 +454,8 @@ def main():
if not options.nocheckout: if not options.nocheckout:
# We need to check this out because we're using stuff from bb.utils # We need to check this out because we're using stuff from bb.utils
# below, and if we don't it might be a python 2 revision which would # below, and if we don't then whatever is currently checked out might
# be an issue # be something incompatible
utils.checkout_repo(bitbakepath, safe_bitbake_branch, logger=logger) utils.checkout_repo(bitbakepath, safe_bitbake_branch, logger=logger)
deps_dict = utils.explode_dep_versions2(bitbakepath, deps) deps_dict = utils.explode_dep_versions2(bitbakepath, deps)

View File

@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python3
# Update layer index database for a single layer # Update layer index database for a single layer
# #