remove 'COLLECTION' from the packaging hierarchy

Each Graphviz version has a notion of “collection,” which traditionally could be
the values “stable” or “development.” The semantically versioned releases that
are published to the website are considered stable. The inter-release packages
that the deploy.py script still uploads to the Gitlab package repository are
considered development. gen_version.py knows how to determine the collection of
a version during build.

Additionally .gitlab-ci.yml knew of another collection value, “experimental,” of
which gen_version.py was unaware. It would manually tweak the collection to this
for certain non-mainstream builds.

deploy.py knows nothing of this notion of collections.

The combined effect of the above has led to some negative outcomes:

  1. Published releases include a mixture of files labelled “stable” and files
     labelled “experimental.” It is not clear to the general public what either
     of these labels mean or how they differ.

  2. In recent times, “development” versions are no more or less stable than
     “stable” versions. The terminology here unfortunately has become
     inaccurate.

  3. The directory hierarchy for published releases has included an extra level
     for collection. If deployment worked as intended, this would be redundant
     as every release artifact would be “stable.” However, as discussed above,
     the deployment script actually publishes “experimental” artifacts as well.

To reduce confusion and simplify build and packaging going forwards, this change
removes the notion of collection. The generated COLLECTION file is no longer
produced and users should have no need to be aware of this concept.
gen_version.py still internally knows the idea of collections to distinguish
published release version numbers from inter-release version numbers. But this
is no longer exposed to the rest of the build system and packaging.

The notion of “experimental” as a collection value is completely removed.

Closes #2148.

diff --git a/.gitignore b/.gitignore
index 2a42ae6dc8b4df10d8db5f6698bd8a7887238502..34e6b259e93f8b89d22fb276a550cf19b0611267 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,6 @@ CMakeCache.txt
 # product of: make dist
 /graphviz-*.tar.gz
 /GRAPHVIZ_VERSION
-/COLLECTION
 
 cmd/gvedit/moc_csettings.cpp
 cmd/gvedit/moc_imageviewer.cpp

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0ea854c3fe0f22197df7f84b8103922f30e893b3..c33167f89d524697b00ec34d166854e6b5ac080c 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,7 +29,6 @@ portable-source:
         expire_in: 1 week
         paths:
             - GRAPHVIZ_VERSION
-            - COLLECTION
             - graphviz-*.tar.gz
             - graphviz-*.tar.xz
     except:
@@ -47,10 +46,9 @@ portable-source:
         when: on_success
         expire_in: 1 week
         paths:
-            - Packages/*/*/*/*/*.rpm
-            - Metadata/*/*/*/configure.log
+            - Packages/*/*/*/*.rpm
+            - Metadata/*/*/configure.log
             - GRAPHVIZ_VERSION
-            - COLLECTION
         reports:
             metrics: metrics.txt
     except:
@@ -69,10 +67,9 @@ portable-source:
         when: on_success
         expire_in: 1 week
         paths:
-            - Packages/*/*/*/*/*deb
-            - Metadata/*/*/*/configure.log
+            - Packages/*/*/*/*deb
+            - Metadata/*/*/configure.log
             - GRAPHVIZ_VERSION
-            - COLLECTION
         reports:
             metrics: metrics.txt
     except:
@@ -100,10 +97,9 @@ portable-source:
         expire_in: 1 week
         paths:
             - GRAPHVIZ_VERSION
-            - COLLECTION
-            - Packages/*/*/*/*/*.zip
-            - Packages/*/*/*/*/*.tar.gz
-            - Metadata/*/*/*/configure.log
+            - Packages/*/*/*/*.zip
+            - Packages/*/*/*/*.tar.gz
+            - Metadata/*/*/configure.log
         reports:
             metrics: metrics.txt
     except:
@@ -152,8 +148,6 @@ portable-source:
         - cat metrics.txt
         # avoid BOM in GRAPHVIZ_VERSION file
         - python gen_version.py | Out-File GRAPHVIZ_VERSION -Encoding ascii
-        # avoid BOM in COLLECTION file
-        - python gen_version.py --collection | Out-File COLLECTION -Encoding ascii
         # Package
         - $Env:GV_VERSION=$( cat GRAPHVIZ_VERSION )
         - >-
@@ -196,8 +190,7 @@ portable-source:
         # Create artifacts to archive
         - $ID = "windows"
         - $VERSION_ID = "10"
-        - $COLLECTION = $( cat COLLECTION )
-        - $DIR = "Packages\${COLLECTION}\${ID}\${VERSION_ID}\$env:build_system\$env:configuration"
+        - $DIR = "Packages\${ID}\${VERSION_ID}\$env:build_system\$env:configuration"
         - mkdir -p $DIR
         - >-
             if($env:build_system -eq "cmake") {
@@ -209,8 +202,8 @@ portable-source:
         when: on_success
         expire_in: 1 week
         paths:
-        - Packages/*/*/*/*/*/*.exe
-        - Packages/*/*/*/*/*/*.zip
+        - Packages/*/*/*/*/*.exe
+        - Packages/*/*/*/*/*.zip
         reports:
             metrics: metrics.txt
             junit: report.xml
@@ -393,7 +386,6 @@ ubuntu21-04-static-build:
     <<: *deb_build_definition
     before_script:
         - export CONFIGURE_OPTIONS="--disable-shared --enable-static"
-        - echo experimental > COLLECTION
     needs:
         - job: docker_build_ubuntu-21.04
           artifacts: false
@@ -403,11 +395,10 @@ ubuntu21-04-static-build:
         when: on_success
         expire_in: 1 week
         paths:
-            - Packages/*/*/*/*/*deb
-            - Packages/*/*/*/*/*.xz
-            - Metadata/*/*/*/configure.log
+            - Packages/*/*/*/*deb
+            - Packages/*/*/*/*.xz
+            - Metadata/*/*/configure.log
             - GRAPHVIZ_VERSION
-            - COLLECTION
         reports:
             metrics: metrics.txt
     tags:
@@ -419,7 +410,6 @@ ubuntu21-10-static-build:
     <<: *deb_build_definition
     before_script:
         - export CONFIGURE_OPTIONS="--disable-shared --enable-static"
-        - echo experimental > COLLECTION
     needs:
         - job: docker_build_ubuntu-21.10
           artifacts: false
@@ -429,11 +419,10 @@ ubuntu21-10-static-build:
         when: on_success
         expire_in: 1 week
         paths:
-            - Packages/*/*/*/*/*deb
-            - Packages/*/*/*/*/*.xz
-            - Metadata/*/*/*/configure.log
+            - Packages/*/*/*/*deb
+            - Packages/*/*/*/*.xz
+            - Metadata/*/*/configure.log
             - GRAPHVIZ_VERSION
-            - COLLECTION
         reports:
             metrics: metrics.txt
     tags:
@@ -468,7 +457,6 @@ macos-autotools-build:
     <<: *macos_build_definition
     before_script:
         - python3 gen_version.py > GRAPHVIZ_VERSION # FIXME: remove when building from portable source
-        - echo experimental > COLLECTION
         - export build_system="autotools"
     tags:
         - shared-macos-amd64
@@ -484,8 +472,6 @@ windows-cygwin-build:
         - git -c core.autocrlf=false reset --hard
         - choco config set cacheLocation choco-cache
         - choco install --yes --no-progress cygwin
-        # avoid BOM in COLLECTION file
-        - echo experimental | Out-File COLLECTION -Encoding ascii
         - $Env:build_system = "autotools"
         # change line endings from crlf to lf by git checkout
         - C:\tools\cygwin\bin\bash -l -c 'cd $CI_PROJECT_DIR && ci/cygwin-build.sh'
@@ -494,8 +480,7 @@ windows-cygwin-build:
         expire_in: 1 week
         paths:
             - GRAPHVIZ_VERSION
-            - COLLECTION
-            - Packages/*/*/*/*/*.xz
+            - Packages/*/*/*/*.xz
     cache:
         key: windows-cygwin-build
         paths:
@@ -516,8 +501,6 @@ windows-cygwin-build-using-autogen:
         - choco install --yes --no-progress cygwin
         - choco install --yes --no-progress --params "/InstallDir:C:\Python3" python3
         - $env:Path = "C:\Python3;" + $env:Path
-        # avoid BOM in COLLECTION file
-        - echo experimental | Out-File COLLECTION -Encoding ascii
         # avoid BOM in GRAPHVIZ_VERSION file
         - python gen_version.py | Out-File GRAPHVIZ_VERSION -Encoding ascii
         - $Env:build_system = "autotools"
@@ -527,8 +510,7 @@ windows-cygwin-build-using-autogen:
         when: always
         expire_in: 1 week
         paths:
-            - COLLECTION
-            - Packages/*/*/*/*/*.xz
+            - Packages/*/*/*/*.xz
     cache:
         key: windows-cygwin-build-using-autogen
         paths:
@@ -548,7 +530,6 @@ ubuntu18-04-cmake-build:
         # fail on any compiler warnings
         - export CFLAGS=-Werror
         - export CXXFLAGS=-Werror
-        - echo experimental > COLLECTION
     tags:
         - linux
     variables:
@@ -565,7 +546,6 @@ ubuntu21-04-cmake-build:
         - export CFLAGS=-Werror
         - export CXXFLAGS=-Werror
         - export CMAKE_OPTIONS="-Dwith_cxx_tests=ON -Dwith_cxx_api=ON"
-        - echo experimental > COLLECTION
     tags:
         - linux
     variables:
@@ -582,7 +562,6 @@ ubuntu21-10-cmake-build:
         - export CFLAGS=-Werror
         - export CXXFLAGS=-Werror
         - export CMAKE_OPTIONS="-Dwith_cxx_tests=ON -Dwith_cxx_api=ON"
-        - echo experimental > COLLECTION
     tags:
         - linux
     variables:
@@ -607,7 +586,6 @@ ubuntu21-04-cmake-minimal-build:
         - export CMAKE_OPTIONS="$CMAKE_OPTIONS -Dwith_sfdp=OFF"
         - export CMAKE_OPTIONS="$CMAKE_OPTIONS -Dwith_smyrna=OFF"
         - export CMAKE_OPTIONS="$CMAKE_OPTIONS -Dwith_zlib=OFF"
-        - echo experimental > COLLECTION
     tags:
         - linux
     variables:
@@ -632,7 +610,6 @@ ubuntu21-10-cmake-minimal-build:
         - export CMAKE_OPTIONS="$CMAKE_OPTIONS -Dwith_sfdp=OFF"
         - export CMAKE_OPTIONS="$CMAKE_OPTIONS -Dwith_smyrna=OFF"
         - export CMAKE_OPTIONS="$CMAKE_OPTIONS -Dwith_zlib=OFF"
-        - echo experimental > COLLECTION
     tags:
         - linux
     variables:
@@ -649,7 +626,6 @@ ubuntu21-04-cmake-ASan-build-for-ctest:
         - export CFLAGS=-Werror
         - export CXXFLAGS=-Werror
         - export CMAKE_OPTIONS="-Duse_sanitizers=ON -Duse_coverage=ON -Dwith_cxx_tests=ON -Dwith_cxx_api=ON"
-        - echo experimental > COLLECTION
     # override the deb_build_definition artifacts since we need more
     # files from the build directory when running ctest in the test
     # stage.
@@ -674,8 +650,8 @@ ubuntu21-04-cmake-ASan-build-for-ctest:
             # the dot program is needed to configure the plugins before running pre-install tests
             - build/cmd/dot/dot
             # the packages need to be installed for the post-install tests
-            - Packages/*/*/*/*/*deb
-            - Metadata/*/*/*/configure.log
+            - Packages/*/*/*/*deb
+            - Metadata/*/*/configure.log
         reports:
             metrics: metrics.txt
     tags:
@@ -694,7 +670,6 @@ ubuntu21-10-cmake-ASan-build-for-ctest:
         - export CFLAGS=-Werror
         - export CXXFLAGS=-Werror
         - export CMAKE_OPTIONS="-Duse_sanitizers=ON -Duse_coverage=ON -Dwith_cxx_tests=ON -Dwith_cxx_api=ON"
-        - echo experimental > COLLECTION
     # override the deb_build_definition artifacts since we need more
     # files from the build directory when running ctest in the test
     # stage.
@@ -719,8 +694,8 @@ ubuntu21-10-cmake-ASan-build-for-ctest:
             # the dot program is needed to configure the plugins before running pre-install tests
             - build/cmd/dot/dot
             # the packages need to be installed for the post-install tests
-            - Packages/*/*/*/*/*deb
-            - Metadata/*/*/*/configure.log
+            - Packages/*/*/*/*deb
+            - Metadata/*/*/configure.log
         reports:
             metrics: metrics.txt
     tags:
@@ -738,7 +713,6 @@ centos7-cmake-build:
         # fail on any compiler warnings
         - export CFLAGS=-Werror
         - export CXXFLAGS=-Werror
-        - echo experimental > COLLECTION
     tags:
         - linux
     variables:
@@ -747,7 +721,6 @@ centos7-cmake-build:
 macos-cmake-build:
     <<: *macos_build_definition
     before_script:
-        - echo experimental > COLLECTION
         - export build_system="cmake"
         # fail on any compiler warnings
         - export CFLAGS=-Werror
@@ -832,17 +805,14 @@ windows-mingw32-cmake-build:
     script:
         - choco config set cacheLocation choco-cache
         - choco install --yes --no-progress msys2
-        # avoid BOM in COLLECTION file
-        - echo experimental | Out-File COLLECTION -Encoding ascii
         - $Env:build_system = "cmake"
         - C:\tools\msys64\usr\bin\env MSYSTEM=MINGW32 C:\tools\msys64\usr\bin\bash -l -c 'cd $CI_PROJECT_DIR && ci/mingw-build.sh'
     artifacts:
         when: always
         expire_in: 1 week
         paths:
-            - COLLECTION
-            - Packages/*/*/*/*/*.exe
-            - Packages/*/*/*/*/*.zip
+            - Packages/*/*/*/*.exe
+            - Packages/*/*/*/*.zip
     cache:
         key: windows-mingw32-cmake-build
         paths:
@@ -858,17 +828,14 @@ windows-mingw64-cmake-build:
     script:
         - choco config set cacheLocation choco-cache
         - choco install --yes --no-progress msys2
-        # avoid BOM in COLLECTION file
-        - echo experimental | Out-File COLLECTION -Encoding ascii
         - $Env:build_system = "cmake"
         - C:\tools\msys64\usr\bin\env MSYSTEM=MINGW64 C:\tools\msys64\usr\bin\bash -l -c 'cd $CI_PROJECT_DIR && ci/mingw-build.sh'
     artifacts:
         when: always
         expire_in: 1 week
         paths:
-            - COLLECTION
-            - Packages/*/*/*/*/*.exe
-            - Packages/*/*/*/*/*.zip
+            - Packages/*/*/*/*.exe
+            - Packages/*/*/*/*.zip
     cache:
         key: windows-mingw64-cmake-build
         paths:
@@ -888,17 +855,14 @@ windows-mingw64-cmake-build:
 #         - git -c core.autocrlf=false reset --hard
 #         - choco config set cacheLocation choco-cache
 #         - choco install --yes --no-progress cygwin
-#         # avoid BOM in COLLECTION file
-#         - echo experimental | Out-File COLLECTION -Encoding ascii
 #         - $Env:build_system = "cmake"
 #         - C:\tools\cygwin\bin\bash -l -c 'cd $CI_PROJECT_DIR && ci/cygwin-build.sh'
 #     artifacts:
 #         when: always
 #         expire_in: 1 week
 #         paths:
-#             - COLLECTION
-#             - Packages/*/*/*/*/*.zip
-#             - Packages/*/*/*/*/*.bz2
+#             - Packages/*/*/*/*.zip
+#             - Packages/*/*/*/*.bz2
 #     cache:
 #         key: windows-cygwin-cmake-build
 #         paths:
@@ -911,7 +875,7 @@ windows-mingw64-cmake-build:
 meta-data:
     stage: test
     script:
-        - CONFIGURE_LOGS=Metadata/*/*/*/configure.log
+        - CONFIGURE_LOGS=Metadata/*/*/configure.log
         - ci/generate_configuration_table.py --output-format HTML ${CONFIGURE_LOGS} > configuration-long-no-color.html
         - ci/generate_configuration_table.py --output-format HTML --short ${CONFIGURE_LOGS} > configuration-short-no-color.html
         - ci/generate_configuration_table.py --output-format HTML --short --color ${CONFIGURE_LOGS} > configuration-short-color-green-red.html
@@ -1046,7 +1010,6 @@ ubuntu18-04-cmake-test:
     before_script:
         - export build_system="cmake"
         - python3 gen_version.py > GRAPHVIZ_VERSION
-        - echo experimental > COLLECTION
     needs:
         - job: "ubuntu18-04-cmake-build"
           artifacts: true
@@ -1060,7 +1023,6 @@ ubuntu21-04-cmake-test:
     before_script:
         - export build_system="cmake"
         - python3 gen_version.py > GRAPHVIZ_VERSION
-        - echo experimental > COLLECTION
     needs:
         - job: "ubuntu21-04-cmake-build"
           artifacts: true
@@ -1074,7 +1036,6 @@ ubuntu21-10-cmake-test:
     before_script:
         - export build_system="cmake"
         - python3 gen_version.py > GRAPHVIZ_VERSION
-        - echo experimental > COLLECTION
     needs:
         - job: "ubuntu21-10-cmake-build"
           artifacts: true
@@ -1091,7 +1052,6 @@ ubuntu21.04-cmake-ASan-test-including-ctest:
         - export CXXFLAGS=" -g -fsanitize=address,undefined"
         - export LDFLAGS=" -g -fsanitize=address,undefined"
         - python3 gen_version.py > GRAPHVIZ_VERSION
-        - echo experimental > COLLECTION
     needs:
         - job: "ubuntu21-04-cmake-ASan-build-for-ctest"
           artifacts: true
@@ -1108,7 +1068,6 @@ ubuntu21.10-cmake-ASan-test-including-ctest:
         - export CXXFLAGS=" -g -fsanitize=address,undefined"
         - export LDFLAGS=" -g -fsanitize=address,undefined"
         - python3 gen_version.py > GRAPHVIZ_VERSION
-        - echo experimental > COLLECTION
     needs:
         - job: "ubuntu21-10-cmake-ASan-build-for-ctest"
           artifacts: true
@@ -1122,7 +1081,6 @@ centos7-cmake-test:
     before_script:
         - export build_system="cmake"
         - python3 gen_version.py > GRAPHVIZ_VERSION
-        - echo experimental > COLLECTION
         # Graphviz libs are installed in /usr/lib, but Centos 7 doesn't look there by default
         - export LD_LIBRARY_PATH=/usr/lib
     needs:

diff --git a/Makefile.am b/Makefile.am
index 46c78c23c8470f35fe161d9b5f406c42f42e95b1..175f2a1313a26039f4611f08c8de54e782c14740 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,7 +26,6 @@ doxygen:
 
 dist-hook:
        echo "@VERSION@" >GRAPHVIZ_VERSION
-       echo "@GRAPHVIZ_COLLECTION@" >COLLECTION
 
 BUILT_SOURCES = $(top_builddir)/graphviz_version.h
 

diff --git a/autogen.sh b/autogen.sh
index 74cec6c802668fcabdb27e5d4bd450adf8db97ce..397255243336d1afcefc5de144a173047b825a2e 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -32,11 +32,6 @@ else
     echo "Graphviz: abbreviated hash of last commit: $GRAPHVIZ_VERSION_COMMIT"
 fi
 
-if ! GRAPHVIZ_COLLECTION=$( python3 gen_version.py --collection) ; then
-    echo "Error: Failed to set collection" >&2
-    exit 1
-fi
-
 # initialize version for a "development" build
 cat >./version.m4 <<EOF
 dnl Graphviz package version number, (as distinct from shared library version)
@@ -44,7 +39,6 @@ dnl Graphviz package version number, (as distinct from shared library version)
 m4_define([graphviz_version_major],[$GRAPHVIZ_VERSION_MAJOR])
 m4_define([graphviz_version_minor],[$GRAPHVIZ_VERSION_MINOR])
 m4_define([graphviz_version_micro],[$GRAPHVIZ_VERSION_PATCH])
-m4_define([graphviz_collection],[$GRAPHVIZ_COLLECTION])
 
 m4_define([graphviz_version_date],[$GRAPHVIZ_VERSION_DATE])
 m4_define([graphviz_change_date],["$GRAPHVIZ_CHANGE_DATE"])

diff --git a/ci/build.sh b/ci/build.sh
index e5fa636edd4ae482a826196b084643948ddf98a4..f747dac4cb3b4efce3508e31428ec4355d8b00f8 100755 (executable)
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -17,10 +17,9 @@ else
     # remove trailing text after actual version
     VERSION_ID=$( uname -r | sed "s/\([0-9\.]*\).*/\1/")
 fi
-COLLECTION=$( cat COLLECTION )
-META_DATA_DIR=Metadata/${COLLECTION}/${ID}/${VERSION_ID}
+META_DATA_DIR=Metadata/${ID}/${VERSION_ID}
 mkdir -p ${META_DATA_DIR}
-DIR=Packages/${COLLECTION}/${ID}/${VERSION_ID}
+DIR=Packages/${ID}/${VERSION_ID}
 ARCH=$( uname -m )
 mkdir -p ${DIR}/os
 mkdir -p ${DIR}/debug

diff --git a/ci/install-packages.sh b/ci/install-packages.sh
index 2658b565d3c63d2df813f24a191227a19c74e526..7253028f3fe9575972bafed36e509e5ea671011b 100755 (executable)
--- a/ci/install-packages.sh
+++ b/ci/install-packages.sh
@@ -12,8 +12,7 @@ else
 fi
 printf '%s\n' "${ID}" >OS_ID
 GV_VERSION=$( cat GRAPHVIZ_VERSION )
-COLLECTION=$( cat COLLECTION )
-DIR=Packages/${COLLECTION}/${ID}/${VERSION_ID}
+DIR=Packages/${ID}/${VERSION_ID}
 ARCH=$( uname -m )
 
 # Remove possible old version of Graphviz so that we can detect if

diff --git a/configure.ac b/configure.ac
index 506dc6dae134e47d9b03d164f6805dbf6f4f098c..af448cf8d7ae676832000b910f313b43f924d66a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,6 @@ dnl Set Graphviz version information
 #      graphviz_version_major
 #      graphviz_version_minor
 #      graphviz_version_micro
-#      graphviz_collection
 #      graphviz_version_date
 #      graphviz_change_date
 #      graphviz_author_name
@@ -23,9 +22,6 @@ GRAPHVIZ_VERSION_MAJOR=graphviz_version_major()
 GRAPHVIZ_VERSION_MINOR=graphviz_version_minor()
 GRAPHVIZ_VERSION_MICRO=graphviz_version_micro()
 
-# NB: "stable" or "development"
-GRAPHVIZ_COLLECTION=graphviz_collection()
-
 # NB: date/time of last commit - or "0"
 GRAPHVIZ_VERSION_DATE=graphviz_version_date()
 
@@ -37,7 +33,7 @@ GRAPHVIZ_CHANGE_DATE=graphviz_change_date()
 # NB: git commit hash of last commit
 GRAPHVIZ_VERSION_COMMIT=graphviz_version_commit()
 
-GRAPHVIZ_SOURCES=graphviz/$GRAPHVIZ_COLLECTION/SOURCES
+GRAPHVIZ_SOURCES=graphviz/SOURCES
 
 AC_SUBST([GRAPHVIZ_VERSION_MAJOR])
 AC_SUBST([GRAPHVIZ_VERSION_MINOR])
@@ -48,7 +44,6 @@ AC_SUBST([GRAPHVIZ_AUTHOR_NAME])
 AC_SUBST([GRAPHVIZ_AUTHOR_EMAIL])
 AC_SUBST([GRAPHVIZ_CHANGE_DATE])
 AC_SUBST([GRAPHVIZ_VERSION_COMMIT])
-AC_SUBST([GRAPHVIZ_COLLECTION])
 AC_SUBST([GRAPHVIZ_SOURCES])
 
 dnl ===========================================================================

diff --git a/gen_version.py b/gen_version.py
index a10924f1aab293449b033f1daa41a3ccc8e03c5b..f0f433e155319267f4795bae55e6526b0f8ab0d3 100644 (file)
--- a/gen_version.py
+++ b/gen_version.py
@@ -98,11 +98,6 @@ parser.add_argument("--committer-date-graphviz",
                     help="Print graphviz special formatted committer date in UTC "
                     "instead of version"
 )
-parser.add_argument("--collection",
-                    action="store_true",
-                    help='Print collection ("stable" or "development") '
-                    "instead of version"
-)
 parser.add_argument("--major",
                     dest="component",
                     action="store_const",
@@ -165,11 +160,6 @@ if args.date_format:
     print(f'#define BUILDDATE "{committer_date}"')
   else:
     print(committer_date)
-elif args.collection:
-  if args.definition:
-    print(f'#define COLLECTION "{collection}"')
-  else:
-    print(collection)
 elif args.component == "major":
   if args.definition:
     print(f'#define VERSION_MAJOR "{major_version}"')