ci: update .tar.gz URLs for gitea (like #74706)

Django 2.2.21 introduced the validation of FieldFile.save() name
argument, which cannot contain a path separator anymore.

ref. https://docs.djangoproject.com/en/3.2/releases/2.2.21/

Jenkinsfile

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-@Library('eo-jenkins-lib@master') import eo.Utils
+@Library('eo-jenkins-lib@main') import eo.Utils
 
 pipeline {
     agent any
@@ -41,10 +41,18 @@ pipeline {
         stage('Packaging') {
             steps {
                 script {
-                    if (env.JOB_NAME == 'passerelle-atreal-openads' && env.GIT_BRANCH == 'origin/master') {
-                        sh 'sudo -H -u eobuilder /usr/local/bin/eobuilder passerelle-atreal-openads'
+                    env.SHORT_JOB_NAME=sh(
+                        returnStdout: true,
+                        // given JOB_NAME=gitea/project/PR-46, returns project
+                        // given JOB_NAME=project/main, returns project
+                        script: '''
+                            echo "${JOB_NAME}" | sed "s/gitea\\///" | awk -F/ '{print $1}'
+                        '''
+                    ).trim()
+                    if (env.GIT_BRANCH == 'main' || env.GIT_BRANCH == 'origin/main') {
+                        sh "sudo -H -u eobuilder /usr/local/bin/eobuilder ${SHORT_JOB_NAME}"
                     } else if (env.GIT_BRANCH.startsWith('hotfix/')) {
-                        sh "sudo -H -u eobuilder /usr/local/bin/eobuilder --branch ${env.GIT_BRANCH} --hotfix passerelle-atreal-openads"
+                        sh "sudo -H -u eobuilder /usr/local/bin/eobuilder --branch ${env.GIT_BRANCH} --hotfix ${SHORT_JOB_NAME}"
                     }
                 }
             }

tests/conftest.py

@@ -182,7 +182,8 @@ def forwardfile_1(fake_conf, db, atreal_openads, collectivite_1):
         orig_filename=os.path.basename(fake_conf['TEST_FILE_CERFA_DIA']),
         content_type='application/pdf',
         file_hash='ffdf456fdsvgb4bgfb6g4f5b',
-        upload_file=File(open(fake_conf['TEST_FILE_CERFA_DIA'], 'rb')),
+        upload_file=File(open(fake_conf['TEST_FILE_CERFA_DIA'], 'rb'),
+            name=os.path.basename(fake_conf['TEST_FILE_CERFA_DIA'])),
         upload_status='pending'
     )
 
@@ -200,7 +201,8 @@ def forwardfile_2(fake_conf, connecteur=None, collectivite=None):
         orig_filename=os.path.basename(fake_conf['TEST_FILE_CERFA_DIA']),
         content_type='application/pdf',
         file_hash='ffdf456fdsvgb4bgfb6g4f5b',
-        upload_file=File(open(fake_conf['TEST_FILE_CERFA_DIA'], 'rb')),
+        upload_file=File(open(fake_conf['TEST_FILE_CERFA_DIA'], 'rb'),
+            name=os.path.basename(fake_conf['TEST_FILE_CERFA_DIA'])),
         upload_status='pending'
     )
 

tests/test_atreal_openads.py

@@ -76,7 +76,7 @@ def build_forwardfile_from_path(connecteur, path, numero_dossier, type_fichier):
         fwd_file.content_type = magic.from_file(path, mime=True)
         with open(path, 'rb') as file_pt:
             fwd_file.file_hash = get_file_digest(file_pt)
-        fwd_file.upload_file = File(open(path, 'rb'))
+        fwd_file.upload_file = File(open(path, 'rb'), name=fwd_file.orig_filename)
         fwd_file.upload_status = 'pending'
         return fwd_file
     return None

tests/test_views.py

@@ -138,7 +138,7 @@ def test_forwardfile_view(atreal_openads, collectivite_1, forwardfile_1, request
 
     queryset = view.get_queryset()
     assert queryset.query is not None
-    assert queryset.query.order_by == ['id']
+    assert list(queryset.query.order_by) == ['id']
     assert queryset.query.default_ordering
     assert queryset.query.get_meta().ordering == ['-last_update_datetime']
     assert queryset.ordered
@@ -146,7 +146,7 @@ def test_forwardfile_view(atreal_openads, collectivite_1, forwardfile_1, request
     request_1.GET['order-by'] = '-id'
     queryset = view.get_queryset()
     assert queryset.query is not None
-    assert queryset.query.order_by == ['-id']
+    assert list(queryset.query.order_by) == ['-id']
     assert queryset.query.default_ordering
 
     request_1.path = '/manage/atreal-openads/%s/forward-files' % atreal_openads.slug
@@ -162,7 +162,7 @@ def test_forwardfile_view(atreal_openads, collectivite_1, forwardfile_1, request
 
     queryset = view.get_queryset()
     assert queryset.query is not None
-    assert queryset.query.order_by == ['id']
+    assert list(queryset.query.order_by) == ['id']
     assert queryset.query.default_ordering
     assert queryset.query.get_meta().ordering == ['-last_update_datetime']
     assert queryset.ordered
@@ -245,7 +245,7 @@ def test_collectivite_view(atreal_openads, collectivite_1, forwardfile_1, reques
 
     queryset = view.get_queryset()
     assert queryset.query is not None
-    assert queryset.query.order_by == ['id']
+    assert list(queryset.query.order_by) == ['id']
     assert queryset.query.default_ordering
     assert queryset.query.get_meta().ordering == ['name']
     assert queryset.ordered
@@ -253,7 +253,7 @@ def test_collectivite_view(atreal_openads, collectivite_1, forwardfile_1, reques
     request_1.GET['order-by'] = '-id'
     queryset = view.get_queryset()
     assert queryset.query is not None
-    assert queryset.query.order_by == ['-id']
+    assert list(queryset.query.order_by) == ['-id']
     assert queryset.query.default_ordering
 
 

tox.ini

@@ -16,7 +16,7 @@
 ; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 [tox]
-envlist = py2-junit, py3-junit-coverage
+envlist = py3-junit-coverage
 toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/passerelle-atreal-openads/{env:BRANCH_NAME:}
 
 [testenv]
@@ -30,19 +30,18 @@ setenv =
   coverage: COVERAGE=--cov-report xml --cov-report html --cov=atreal_openads/
   junit: JUNIT=--junitxml=junit-{envname}.xml
 deps =
-  http://git.entrouvert.org/passerelle.git/snapshot/passerelle-master.tar.gz
+  https://git.entrouvert.org/entrouvert/passerelle/archive/main.tar.gz
   pytest-cov
   pytest-django
   pytest>=3.3.0
   WebTest
-  mock
+  mock<4
   httmock
-  psycopg2-binary
+  psycopg2-binary<2.9
   pylint<1.8
   pylint-django<0.8.1
   django-webtest<1.9.3
   xmlschema<1.1
-  py2: enum34<=1.1.6
 commands =
   py.test {posargs: {env:COVERAGE:} {env:JUNIT:} tests/}
   coverage: ./pylint.sh atreal_openads/
@@ -52,6 +51,6 @@ usedevelop = True
 setenv =
   DJANGO_SETTINGS_MODULE=passerelle.settings
 deps =
-  http://git.entrouvert.org/passerelle.git/snapshot/passerelle-master.tar.gz
+  https://git.entrouvert.org/entrouvert/passerelle/archive/main.tar.gz
 commands =
   python3 ./manage.py {posargs:--help}