You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by di...@apache.org on 2023/09/18 15:00:44 UTC
[allura] branch dw/8519 updated (30150e09d -> 70224e2d6)
This is an automated email from the ASF dual-hosted git repository.
dill0wn pushed a change to branch dw/8519
in repository https://gitbox.apache.org/repos/asf/allura.git
discard 30150e09d fixup! fixup! [#8519] drop py3.7 support: changed various 3.7 updates to 3.8 or other, etc.
discard da2d5477c fixup! [#8519] ran 'pyupgrade --py38-plus --keep-mock ./**/*.py'
discard a7b6d052b fixup! [#8519] drop py3.7 support: changed various 3.7 updates to 3.8 or other, etc.
discard 2b7790071 [#8519] drop py3.7 support: changed various 3.7 updates to 3.8 or other, etc.
discard 9e56f5cea [#8519] ran 'pyupgrade --py38-plus --keep-mock ./**/*.py'
discard a1a80780b [#8519] re pip-compile with python 3.8
discard 7a0b7acbf [#8519] Upgrade Werkzeug 2.3.6 -> 2.3.7, and its deps: MarkupSafe
discard 608708edf [#8519] Upgrade pre-commit 2.21.0 -> 3.4.0, and its deps: cfgv,identify,nodeenv,setuptools,PyYAML,virtualenv,distlib,filelock,platformdirs
add ed16f963e specify formats supported for screenshots (BMP or GIF could work too, but not recommended)
new 0100fef1e [#8519] Upgrade pre-commit 2.21.0 -> 3.4.0, and its deps: cfgv,identify,nodeenv,setuptools,PyYAML,virtualenv,distlib,filelock,platformdirs
new aa5c85222 [#8519] Upgrade Werkzeug 2.3.6 -> 2.3.7, and its deps: MarkupSafe
new 4148afef2 [#8519] re pip-compile with python 3.8
new edfc0f812 [#8519] ran 'pyupgrade --py38-plus --keep-mock ./**/*.py'
new 70224e2d6 [#8519] drop py3.7 support: changed various 3.7 updates to 3.8 or other, etc.
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (30150e09d)
\
N -- N -- N refs/heads/dw/8519 (70224e2d6)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Allura/allura/ext/admin/widgets.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[allura] 01/05: [#8519] Upgrade pre-commit 2.21.0 -> 3.4.0, and its deps: cfgv,identify,nodeenv,setuptools,PyYAML,virtualenv,distlib,filelock,platformdirs
Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dill0wn pushed a commit to branch dw/8519
in repository https://gitbox.apache.org/repos/asf/allura.git
commit 0100fef1ef262bf1b0efe6e97faece5f83518efe
Author: Dillon Walls <di...@slashdotmedia.com>
AuthorDate: Tue Sep 12 20:22:07 2023 +0000
[#8519] Upgrade pre-commit 2.21.0 -> 3.4.0, and its deps: cfgv,identify,nodeenv,setuptools,PyYAML,virtualenv,distlib,filelock,platformdirs
pre-commit 2.21.0 -> 3.4.0
cfgv 3.4.0 -> no upgrade
identify 2.5.28 -> no upgrade
nodeenv 1.8.0 -> no upgrade
setuptools 68.2.2 -> skipped
PyYAML 6.0.1 -> no upgrade
virtualenv 20.24.5 -> no upgrade
distlib 0.3.7 -> no upgrade
filelock 3.12.3 -> no upgrade
platformdirs 3.10.0 -> no upgrade
---
requirements.in | 2 +-
requirements.txt | 32 +++++++-------------------------
2 files changed, 8 insertions(+), 26 deletions(-)
diff --git a/requirements.in b/requirements.in
index 374a1a6df..958f8870d 100644
--- a/requirements.in
+++ b/requirements.in
@@ -59,4 +59,4 @@ pytest-sugar
# deployment
gunicorn
-pre-commit==2.21.0 # Supports Python 3.7 and 3.11
\ No newline at end of file
+pre-commit
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index 9c4ddd6f7..511f5707a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
#
-# This file is autogenerated by pip-compile with Python 3.7
+# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# pip-compile
@@ -18,7 +18,7 @@ certifi==2023.7.22
# via requests
cffi==1.15.1
# via cryptography
-cfgv==3.3.1
+cfgv==3.4.0
# via pre-commit
charset-normalizer==3.1.0
# via requests
@@ -42,8 +42,6 @@ easywidgets==0.4.1
# via -r requirements.in
emoji==2.7.0
# via -r requirements.in
-exceptiongroup==1.1.1
- # via pytest
execnet==2.0.2
# via pytest-xdist
faust-cchardet==2.1.18
@@ -52,7 +50,7 @@ feedgenerator==2.1.0
# via -r requirements.in
feedparser==6.0.10
# via -r requirements.in
-filelock==3.12.2
+filelock==3.12.3
# via virtualenv
formencode==2.0.1
# via
@@ -71,18 +69,10 @@ html5lib==1.1
# -r requirements.in
# pypeline
# textile
-identify==2.5.24
+identify==2.5.28
# via pre-commit
idna==3.4
# via requests
-importlib-metadata==6.6.0
- # via
- # gunicorn
- # markdown
- # pluggy
- # pre-commit
- # pytest
- # virtualenv
inflection==0.5.1
# via profanityfilter
iniconfig==2.0.0
@@ -140,7 +130,7 @@ platformdirs==3.10.0
# via virtualenv
pluggy==1.2.0
# via pytest
-pre-commit==2.21.0
+pre-commit==3.4.0
# via -r requirements.in
profanityfilter==2.0.6
# via -r requirements.in
@@ -236,21 +226,15 @@ timermiddleware==0.6.2
# via -r requirements.in
tinycss2==1.1.1
# via bleach
-tomli==2.0.1
- # via pytest
translationstring==1.4
# via colander
turbogears2==2.4.3
# via -r requirements.in
typing-extensions==4.7.1
- # via
- # gitpython
- # importlib-metadata
- # platformdirs
- # qrcode
+ # via qrcode
urllib3==1.26.15
# via requests
-virtualenv==20.24.3
+virtualenv==20.24.5
# via pre-commit
waitress==2.1.2
# via webtest
@@ -274,8 +258,6 @@ werkzeug==2.2.3
# via -r requirements.in
wrapt==1.15.0
# via -r requirements.in
-zipp==3.15.0
- # via importlib-metadata
# The following packages are considered to be unsafe in a requirements file:
# setuptools
[allura] 05/05: [#8519] drop py3.7 support: changed various 3.7 updates to 3.8 or other, etc.
Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dill0wn pushed a commit to branch dw/8519
in repository https://gitbox.apache.org/repos/asf/allura.git
commit 70224e2d61f96f809f5efeb8e7057315c1423ea5
Author: Dillon Walls <di...@slashdotmedia.com>
AuthorDate: Thu Sep 14 20:03:19 2023 +0000
[#8519] drop py3.7 support: changed various 3.7 updates to 3.8 or other, etc.
---
Allura/allura/lib/helpers.py | 2 +-
Allura/allura/tests/exclude_from_rewrite_hook.py | 1 +
Allura/docs/getting_started/install_each_step.rst | 8 ++++----
Allura/docs/getting_started/installation.rst | 4 ++--
CHANGES | 6 ++++++
Dockerfile | 3 ++-
scripts/init-docker-dev.sh | 2 +-
scripts/jenkins-run.sh | 2 +-
8 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/Allura/allura/lib/helpers.py b/Allura/allura/lib/helpers.py
index a164863d9..9e9f8b294 100644
--- a/Allura/allura/lib/helpers.py
+++ b/Allura/allura/lib/helpers.py
@@ -1089,7 +1089,7 @@ def plain2markdown(txt, preserve_multiple_spaces=False, has_html_entities=False)
return txt
-OrderedDefaultDict = defaultdict # py3.7 dicts are always ordered
+OrderedDefaultDict = defaultdict # py3.7+ dicts are always ordered
def iter_entry_points(group, *a, **kw):
diff --git a/Allura/allura/tests/exclude_from_rewrite_hook.py b/Allura/allura/tests/exclude_from_rewrite_hook.py
index defaeac2b..828f994c4 100644
--- a/Allura/allura/tests/exclude_from_rewrite_hook.py
+++ b/Allura/allura/tests/exclude_from_rewrite_hook.py
@@ -22,6 +22,7 @@ from allura.lib.decorators import task
from allura.lib.exceptions import CompoundError
+# TODO: [#8520] migrate from pkg_resources to importlib.resources
class ThemeProviderTestApp(Application):
"""
If this test class is added directly to a test module, pkg_resources internals
diff --git a/Allura/docs/getting_started/install_each_step.rst b/Allura/docs/getting_started/install_each_step.rst
index fccdd670f..264b37f08 100644
--- a/Allura/docs/getting_started/install_each_step.rst
+++ b/Allura/docs/getting_started/install_each_step.rst
@@ -44,7 +44,7 @@ In these instructions, we'll use `VirtualBox <http://www.virtualbox.org>`__ and
System Packages
^^^^^^^^^^^^^^^
-Before we begin, you'll need to install some system packages. Allura currently supports Python 3.7 through 3.11. The steps below use 3.7.
+Before we begin, you'll need to install some system packages. Allura currently supports Python 3.8 through 3.11. The steps below use Python 3.11.
.. code-block:: bash
@@ -53,7 +53,7 @@ Before we begin, you'll need to install some system packages. Allura currently
~$ sudo apt-get install software-properties-common
~$ sudo add-apt-repository ppa:deadsnakes/ppa
~$ sudo apt-get update
- ~$ sudo apt-get install git-core python3.7 python3.7-dev gcc libmagic1 libssl-dev libldap2-dev libsasl2-dev libjpeg8-dev zlib1g-dev libffi-dev
+ ~$ sudo apt-get install git-core python3.11 python3.11-dev gcc libmagic1 libssl-dev libldap2-dev libsasl2-dev libjpeg8-dev zlib1g-dev libffi-dev
To install MongoDB, follow the instructions `here <https://docs.mongodb.org/manual/tutorial/install-mongodb-on-ubuntu/>`_.
@@ -70,13 +70,13 @@ The first step to installing the Allura platform is installing a virtual environ
.. code-block:: bash
- ~$ sudo apt-get install python3.7-venv
+ ~$ sudo apt-get install python3.11-venv
Then create a virtual environment. We'll call our Allura environment 'env-allura'.
.. code-block:: bash
- ~$ python3.7 -m venv env-allura
+ ~$ python3.11 -m venv env-allura
This gives us a nice, clean environment into which we can install all the allura dependencies.
In order to use the virtual environment, you'll need to activate it:
diff --git a/Allura/docs/getting_started/installation.rst b/Allura/docs/getting_started/installation.rst
index c680d93f9..20b212c1b 100644
--- a/Allura/docs/getting_started/installation.rst
+++ b/Allura/docs/getting_started/installation.rst
@@ -67,7 +67,7 @@ Build/fetch all required images:
.. note::
- You can override the python version by adding :code:`--build-arg PY_VERSION=3.8` for example.
+ You can override the python version by adding :code:`--build-arg PY_VERSION=3.11` for example.
Python and JS package setup (and first containers started):
@@ -282,7 +282,7 @@ If you'd like to use another webserver, here are a few options:
.. code-block:: bash
~$ pip install mod_wsgi # requires httpd2 devel libraries installed in the system
- ~$ mod_wsgi-express start-server development.ini --application-type paste --user allura --group allura --port 8080 --python-path /PATH/TO/VIRTUALENV/lib/python3.7/site-packages/
+ ~$ mod_wsgi-express start-server development.ini --application-type paste --user allura --group allura --port 8080 --python-path /PATH/TO/VIRTUALENV/lib/python3.11/site-packages/
For any other wsgi server (e.g. mod_wsgi with Apache, or waitress) you will need a wsgi callable set up like this:
diff --git a/CHANGES b/CHANGES
index 268f26278..293acefa0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+NEXT RELEASE (future)
+
+General
+ * [#8519] Drop support for Python 3.7. Python 3.8 or Python 3.11 are officially supported.
+
+
Version 1.15.0 (September 2023)
Upgrade Instructions
diff --git a/Dockerfile b/Dockerfile
index 70b3d54a2..c5e254ed1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,8 +17,9 @@
FROM ubuntu:22.04
-ARG PY_VERSION=3.7
+ARG PY_VERSION=3.11
+# FIXME: change this?
# Ubunutu 18.04's latest python is 3.6 (and Ubuntu 20.04's is 3.8)
# In order to get a different python, we must add the deadsnakes apt repo, and install a specific version
RUN apt-get update \
diff --git a/scripts/init-docker-dev.sh b/scripts/init-docker-dev.sh
index 39001c1f0..afc04a515 100755
--- a/scripts/init-docker-dev.sh
+++ b/scripts/init-docker-dev.sh
@@ -40,7 +40,7 @@ cp /allura/Allura/allura/public/nf/favicon.ico /allura-data/www-misc/favicon.ico
rm -rf /allura-data/virtualenv
if [ ! -e /allura-data/virtualenv ]; then
echo -e "Creating virtualenv\n"
- PYTHON_EXE="${PYTHON_EXE:-python3.7}" # should always be set from Dockerfile, but set default value just in case
+ PYTHON_EXE="${PYTHON_EXE:-python3.11}" # should always be set from Dockerfile, but set default value just in case
$PYTHON_EXE -m venv /allura-data/virtualenv
/allura-data/virtualenv/bin/pip install -U pip
/allura-data/virtualenv/bin/pip install -U wheel
diff --git a/scripts/jenkins-run.sh b/scripts/jenkins-run.sh
index 3e2447a1d..fda940b80 100755
--- a/scripts/jenkins-run.sh
+++ b/scripts/jenkins-run.sh
@@ -19,7 +19,7 @@
# under the License.
IMAGE_TAG=allura
-PY_VERSION="${PY_VERSION:-3.7}"
+PY_VERSION="${PY_VERSION:-3.11}"
echo
echo "============================================================================="
[allura] 02/05: [#8519] Upgrade Werkzeug 2.3.6 -> 2.3.7, and its deps: MarkupSafe
Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dill0wn pushed a commit to branch dw/8519
in repository https://gitbox.apache.org/repos/asf/allura.git
commit aa5c852228a8d792274f5be43ce252d6abf378d2
Author: Dillon Walls <di...@slashdotmedia.com>
AuthorDate: Tue Sep 12 20:23:50 2023 +0000
[#8519] Upgrade Werkzeug 2.3.6 -> 2.3.7, and its deps: MarkupSafe
Werkzeug 2.3.6 -> 2.3.7
MarkupSafe 2.1.3 -> no upgrade
---
requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
index 511f5707a..de84ccf85 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -254,7 +254,7 @@ webob==1.8.7
# webtest
webtest==3.0.0
# via -r requirements.in
-werkzeug==2.2.3
+werkzeug==2.3.7
# via -r requirements.in
wrapt==1.15.0
# via -r requirements.in
[allura] 04/05: [#8519] ran 'pyupgrade --py38-plus --keep-mock ./**/*.py'
Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dill0wn pushed a commit to branch dw/8519
in repository https://gitbox.apache.org/repos/asf/allura.git
commit edfc0f8123a96d2196317e0670984378cb1f532c
Author: Dillon Walls <di...@slashdotmedia.com>
AuthorDate: Thu Sep 14 15:49:39 2023 -0400
[#8519] ran 'pyupgrade --py38-plus --keep-mock ./**/*.py'
---
scripts/teamforge-import.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/scripts/teamforge-import.py b/scripts/teamforge-import.py
index 939ae1e7f..7c68ede2b 100644
--- a/scripts/teamforge-import.py
+++ b/scripts/teamforge-import.py
@@ -883,13 +883,13 @@ def _dir_sql(created_on, project, dir_name, rel_path):
parent_directory = "(SELECT pfs_path FROM pfs_path WHERE path_name = '%s/')" % rel_path
sql = """
UPDATE pfs
- SET file_crtime = '%s'
- WHERE source_pk = (SELECT project.project FROM project WHERE project.project_name = '%s.%s')
+ SET file_crtime = '{}'
+ WHERE source_pk = (SELECT project.project FROM project WHERE project.project_name = '{}.{}')
AND source_table = 'project'
AND pfs_type = 'd'
- AND pfs_name = '%s'
- AND parent_directory = %s;
- """ % (created_on, convert_project_shortname(project.path), options.neighborhood_shortname,
+ AND pfs_name = '{}'
+ AND parent_directory = {};
+ """.format(created_on, convert_project_shortname(project.path), options.neighborhood_shortname,
dir_name, parent_directory)
return sql
[allura] 03/05: [#8519] re pip-compile with python 3.8
Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dill0wn pushed a commit to branch dw/8519
in repository https://gitbox.apache.org/repos/asf/allura.git
commit 4148afef2390757ed328e9dce76ae91205fe5018
Author: Dillon Walls <di...@slashdotmedia.com>
AuthorDate: Thu Sep 14 15:19:40 2023 -0400
[#8519] re pip-compile with python 3.8
---
requirements.txt | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/requirements.txt b/requirements.txt
index de84ccf85..90af17a8f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
#
-# This file is autogenerated by pip-compile with Python 3.11
+# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile
@@ -42,6 +42,8 @@ easywidgets==0.4.1
# via -r requirements.in
emoji==2.7.0
# via -r requirements.in
+exceptiongroup==1.1.3
+ # via pytest
execnet==2.0.2
# via pytest-xdist
faust-cchardet==2.1.18
@@ -73,6 +75,8 @@ identify==2.5.28
# via pre-commit
idna==3.4
# via requests
+importlib-metadata==6.8.0
+ # via markdown
inflection==0.5.1
# via profanityfilter
iniconfig==2.0.0
@@ -226,12 +230,16 @@ timermiddleware==0.6.2
# via -r requirements.in
tinycss2==1.1.1
# via bleach
+tomli==2.0.1
+ # via pytest
translationstring==1.4
# via colander
turbogears2==2.4.3
# via -r requirements.in
typing-extensions==4.7.1
- # via qrcode
+ # via
+ # filelock
+ # qrcode
urllib3==1.26.15
# via requests
virtualenv==20.24.5
@@ -258,6 +266,8 @@ werkzeug==2.3.7
# via -r requirements.in
wrapt==1.15.0
# via -r requirements.in
+zipp==3.16.2
+ # via importlib-metadata
# The following packages are considered to be unsafe in a requirements file:
# setuptools