Make Fedora 39 the default version.

bwoodsend · Nov 4, 2023 · 2b8a76a · 2b8a76a
1 parent a4d31d1
commit 2b8a76a
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 18 deletions.
diff --git a/README.rst b/README.rst
@@ -74,7 +74,7 @@ Distributions  Supported versions
 Alpine_        3.17-3.18, edge
 Arch_          rolling
 Debian_        13 (pre-release)
-Fedora_        37-38, 39 (pre-release), 40 (rawhide)
+Fedora_        37-39, 40 (pre-release)
 Manjaro_       rolling
 OpenSUSE_      Tumbleweed only (rolling)
 Ubuntu_        23.04, 23.10 (interim releases)

diff --git a/docs/source/example-library.rst b/docs/source/example-library.rst
@@ -324,22 +324,22 @@ see :ref:`the package manager cheat sheet <package_manager_cheat_sheet>`).
     ...
     [user@manjaro-2212 io]$ sudo yum whatprovides '*/Python.h'
     ...
-    python3-devel-3.11.2-1.fc38.x86_64 : Libraries and header files needed for
+    python3-devel-3.11.2-1.fc39.x86_64 : Libraries and header files needed for
                                        : Python development
     Repo        : fedora
     Matched from:
     Filename    : /usr/include/python3.11/Python.h
     ...
     [user@manjaro-2212 io]$ sudo yum whatprovides '*/brotli/decode.h'
     ...
-    brotli-devel-1.0.9-11.fc38.x86_64 : Lossless compression algorithm
+    brotli-devel-1.0.9-11.fc39.x86_64 : Lossless compression algorithm
                                       : (development files)
     Repo        : fedora
     Matched from:
     Filename    : /usr/include/brotli/decode.h
     [user@manjaro-2212 io]$ sudo yum whatprovides '*/libbrotlienc*'
     ...
-    libbrotli-1.0.9-11.fc38.x86_64 : Library for brotli lossless compression algorithm
+    libbrotli-1.0.9-11.fc39.x86_64 : Library for brotli lossless compression algorithm
     Repo        : fedora
     Matched from:
     Filename    : /usr/lib64/libbrotlienc.so.1
@@ -369,9 +369,9 @@ These are ``gcc``, ``libbrotli``, ``brotli-devel`` and ``python3-devel``.
 The next ``polycotylus fedora`` run takes us to the end. ::
 
     Built 3 artifacts:
-    debuginfo: .polycotylus/fedora/x86_64/python3-ubrotli-debuginfo-0.1.0-1.fc38.x86_64.rpm
-    debugsource: .polycotylus/fedora/x86_64/python3-ubrotli-debugsource-0.1.0-1.fc38.x86_64.rpm
-    main: .polycotylus/fedora/x86_64/python3-ubrotli-0.1.0-1.fc38.x86_64.rpm
+    debuginfo: .polycotylus/fedora/x86_64/python3-ubrotli-debuginfo-0.1.0-1.fc39.x86_64.rpm
+    debugsource: .polycotylus/fedora/x86_64/python3-ubrotli-debugsource-0.1.0-1.fc39.x86_64.rpm
+    main: .polycotylus/fedora/x86_64/python3-ubrotli-0.1.0-1.fc39.x86_64.rpm
 
 You'll notice that this time, there are three packages produced. The one
 labelled ``main`` is the one you'd distribute. See :ref:`building for Fedora

diff --git a/docs/source/fedora.rst b/docs/source/fedora.rst
@@ -42,8 +42,8 @@ or newer using the commands below respectively. ::
 
     polycotylus fedora:37
     polycotylus fedora:38
-    polycotylus fedora:39  # pre-release
-    polycotylus fedora:40  # rawhide
+    polycotylus fedora:39  # default
+    polycotylus fedora:40  # pre-release
 
 Installing a package built for a different release of Fedora will mean that the
 build and runtime minor versions of Python do not match and by implication

diff --git a/polycotylus/_fedora.py b/polycotylus/_fedora.py
@@ -21,8 +21,8 @@
 
 class Fedora(BaseDistribution):
     name = "fedora"
-    version = "38"
-    base_image = "fedora:38"
+    version = "39"
+    base_image = "fedora:39"
     python_extras = {
         "tkinter": ["python3-tkinter"],
     }
@@ -313,12 +313,12 @@ class Fedora37(Fedora):
     base_image = "fedora:37"
 
 
-Fedora38 = Fedora
+class Fedora38(Fedora):
+    version = "38"
+    base_image = "fedora:38/"
 
 
-class Fedora39(Fedora):
-    version = "39"
-    base_image = "fedora:39"
+Fedora39 = Fedora
 
 
 class Fedora40(Fedora):

diff --git a/tests/mock-packages/poetry-based/pyproject.toml b/tests/mock-packages/poetry-based/pyproject.toml
@@ -12,7 +12,7 @@ homepage = "https://blah.blah"
 python = "^3.8"
 pyperclip = "^1.6"
 tabulate = "~0.9"
-certifi = "2022.*"
+certifi = "2023.*"
 cycler = ">= 0.8, < 10.5"
 toml = { version = "*", extras = ["kittens"] }
 filelock = { version = "^3", optional = true }

diff --git a/tests/test_alpine.py b/tests/test_alpine.py
@@ -5,6 +5,7 @@
 import re
 import platform
 import json
+import contextlib
 
 import toml
 import pytest
@@ -239,6 +240,8 @@ def _write_trove(trove):
 
 
 def test_kitchen_sink(monkeypatch):
+    with contextlib.suppress(FileNotFoundError):
+        shutil.rmtree(shared.kitchen_sink / ".polycotylus/fedora/noarch")
     (shared.kitchen_sink / ".polycotylus/fedora/noarch").mkdir(exist_ok=True, parents=True)
     (shared.kitchen_sink / ".polycotylus/fedora/noarch/python3-99-s1lly-name-packag3-x-y-z-1.2.3-1.fc38.noarch.rpm").touch()
     (shared.kitchen_sink / ".polycotylus/artifacts.json").write_text(json.dumps([

diff --git a/tests/test_fedora.py b/tests/test_fedora.py
@@ -127,10 +127,10 @@ def test_kitchen_sink(monkeypatch):
   },
   {
     "distribution": "fedora",
-    "tag": "38",
+    "tag": "39",
     "architecture": "noarch",
     "variant": "main",
-    "path": ".polycotylus/fedora/noarch/python3-99-s1lly-name-packag3-x-y-z-1.2.3-1.fc38.noarch.rpm"
+    "path": ".polycotylus/fedora/noarch/python3-99-s1lly-name-packag3-x-y-z-1.2.3-1.fc39.noarch.rpm"
   }
 ]"""