Merge branch 'release/1.15.3'

lueschem · Oct 30, 2023 · d12f72a · d12f72a
2 parents 7dcd6fc + 70d45af
commit d12f72a
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 17 deletions.
diff --git a/.github/workflows/package-build.yml b/.github/workflows/package-build.yml
@@ -29,6 +29,9 @@ jobs:
          - distribution: ubuntu
            distribution_release: "23.04"
            repository_type: launchpad
+         - distribution: ubuntu
+           distribution_release: "23.10"
+           repository_type: launchpad
     steps:
       - name: Check out the source code
         uses: actions/checkout@v2

diff --git a/.gitignore b/.gitignore
@@ -18,13 +18,6 @@ htmlcov/
 # sphinx
 docs/_build/
 
-# travis
-edi_*dsc
-edi_*xz
-edi_*deb
-edi_*build
-edi_*changes
-
 # eclipse
 .settings/
 
@@ -46,11 +39,6 @@ artifacts/*.tar.*
 
 # development IDEs
 .idea/
-travis/travis-key.tar
-travis/travis-key.asc
-travis/travis-key.passphrase
-travis/id_rsa
-travis/id_rsa.pub
 
 # Github
 .github/secrets/

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,11 @@
+edi (1.15.3) jammy; urgency=medium
+
+  [ Matthias Lüscher ]
+  * Raised log entry of missing baseline file to warning.
+  * Added build for Ubuntu 23.10.
+
+ -- Matthias Lüscher (Launchpad) <m.luescher@datacomm.ch>  Mon, 30 Oct 2023 22:53:12 +0100
+
 edi (1.15.2) jammy; urgency=medium
 
   [ Matthias Luescher ]

diff --git a/docs/conf.py b/docs/conf.py
@@ -55,8 +55,8 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.15.2'
-release = '1.15.2'
+version = '1.15.3'
+release = '1.15.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/edi/lib/documentationsteprunner.py b/edi/lib/documentationsteprunner.py
@@ -239,7 +239,7 @@ def _get_baseline_versions(self):
         baseline_file = os.path.join(self.raw_input, 'edi', 'packages-baseline.yml')
 
         if not os.path.isfile(baseline_file):
-            logging.info("No file describing the packages baseline found in '{}'.".format(baseline_file))
+            logging.warning("No file describing the packages baseline found in '{}'.".format(baseline_file))
             return dict()
 
         logging.debug("Found file describing the packages baseline in '{}'.".format(baseline_file))

diff --git a/edi/lib/versionhelpers.py b/edi/lib/versionhelpers.py
@@ -26,7 +26,7 @@
 
 # The do_release script will update this version!
 # During launchpad debuild neither the git version nor the package version is available.
-edi_fallback_version = '1.15.2'
+edi_fallback_version = '1.15.3'
 
 
 def get_edi_version():

diff --git a/setup.py b/setup.py
@@ -38,7 +38,7 @@
 setup(
     name='edi',
 
-    version='1.15.2',
+    version='1.15.3',
 
     description='Embedded Development Infrastructure - edi',
     long_description=long_description,

diff --git a/travis-key.tar.enc b/travis-key.tar.enc