Merge pull request #606 from gerrod3/pulpcore-3.25-compat

Prep pulpcore 3.25 compatible release

Author: gerrod3

.ci/scripts/check_requirements.py

@@ -42,9 +42,12 @@
                     else:
                         errors.append(f"{filename}:{nr}: Unreadable requirement {line}")
                 else:
-                    if check_prereleases and req.specifier.prereleases:
-                        if req.name != "pulp-python-client":
-                            errors.append(f"{filename}:{nr}: Prerelease versions found in {line}.")
+                    if not line.startswith("opentelemetry"):
+                        if check_prereleases and req.specifier.prereleases:
+                            if req.name != "pulp-python-client":
+                                errors.append(
+                                    f"{filename}:{nr}: Prerelease versions found in {line}."
+                                )
                     ops = [op for op, ver in req.specs]
                     spec = str(req.specs)
                     if "~=" in ops:

.github/template_gitref

@@ -1 +1 @@
-2021.08.26-212-g18b9346
+2021.08.26-214-gf2ffaa4

.github/workflows/ci.yml

@@ -8,6 +8,11 @@
 ---
 name: Python CI
 on: {pull_request: {branches: ['*']}}
+
+concurrency:
+  group: ${{ github.ref_name }}-${{ github.workflow }}
+  cancel-in-progress: true
+
 jobs:
 
   ready-to-ship:

.github/workflows/codeql-analysis.yml

@@ -11,6 +11,10 @@ on:
   schedule:
     - cron: '37 1 * * 6'
 
+concurrency:
+  group: ${{ github.ref_name }}-${{ github.workflow }}
+  cancel-in-progress: true
+
 jobs:
   analyze:
     name: Analyze

.github/workflows/nightly.yml

@@ -14,6 +14,10 @@ on:
     - cron: '00 3 * * *'
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.ref_name }}-${{ github.workflow }}
+  cancel-in-progress: true
+
 jobs:
   test:
     runs-on: ubuntu-latest

.github/workflows/scripts/script.sh

@@ -123,17 +123,11 @@ else
         cmd_user_prefix bash -c "pytest -v -r sx --color=yes --pyargs pulp_python.tests.functional -m 'not parallel' --nightly"
 
 
-        cmd_user_prefix bash -c "pytest -v -r sx --color=yes --suppress-no-test-exit-code --pyargs pulpcore.tests.functional -m 'from_pulpcore_for_all_plugins and parallel' -n  8 --nightly"
-        cmd_user_prefix bash -c "pytest -v -r sx --color=yes --suppress-no-test-exit-code --pyargs pulpcore.tests.functional -m 'from_pulpcore_for_all_plugins and not parallel'  --nightly"
-    
     else
         cmd_user_prefix bash -c "pytest -v -r sx --color=yes --suppress-no-test-exit-code --pyargs pulp_python.tests.functional -m parallel -n 8"
         cmd_user_prefix bash -c "pytest -v -r sx --color=yes --pyargs pulp_python.tests.functional -m 'not parallel'"
 
 
-        cmd_user_prefix bash -c "pytest -v -r sx --color=yes --suppress-no-test-exit-code --pyargs pulpcore.tests.functional -m 'from_pulpcore_for_all_plugins and parallel' -n  8"
-        cmd_user_prefix bash -c "pytest -v -r sx --color=yes --suppress-no-test-exit-code --pyargs pulpcore.tests.functional -m 'from_pulpcore_for_all_plugins and not parallel'"
-    
     fi
 
 fi

CHANGES/605.feature

@@ -0,0 +1 @@
+Added compatibility for pulpcore 3.25, pulpcore support is now >=3.25,<3.40.

pulp_python/app/migrations/0011_alter_pythondistribution_distribution_ptr_and_more.py

@@ -0,0 +1,40 @@
+# Generated by Django 4.2.1 on 2023-05-15 20:04
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0106_alter_artifactdistribution_distribution_ptr_and_more'),
+        ('python', '0010_update_json_field'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='pythondistribution',
+            name='distribution_ptr',
+            field=models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='core.distribution'),
+        ),
+        migrations.AlterField(
+            model_name='pythonpackagecontent',
+            name='content_ptr',
+            field=models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='core.content'),
+        ),
+        migrations.AlterField(
+            model_name='pythonpublication',
+            name='publication_ptr',
+            field=models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='core.publication'),
+        ),
+        migrations.AlterField(
+            model_name='pythonremote',
+            name='remote_ptr',
+            field=models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='core.remote'),
+        ),
+        migrations.AlterField(
+            model_name='pythonrepository',
+            name='repository_ptr',
+            field=models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='core.repository'),
+        ),
+    ]

requirements.txt

@@ -1,4 +1,4 @@
-pulpcore>=3.22.0,<3.25
+pulpcore>=3.25.0,<3.40
 pkginfo>=1.8.2,<1.9.7
 bandersnatch>=6.1,<6.2
 pypi-simple>=0.9.0,<1.0.0

template_config.yml

@@ -58,7 +58,7 @@ pypi_username: pulp
 python_version: '3.8'
 release_email: [email protected]
 release_user: pulpbot
-run_pulpcore_tests_for_plugins: true
+run_pulpcore_tests_for_plugins: false
 single_commit_check: true
 stalebot: true
 stalebot_days_until_close: 30