Release 1.33.1 (#2010)

* Rename conan.cfg to global.conf (#2008)

* conan.cfg to global.conf

* rename file

* fix format

* fix files

* fix title

* change catalyst to lowercase (#2009)

* conan 1.33.1

.ci/publish.jenkins

@@ -2,7 +2,7 @@
 
 // TODO: Move to a file and avoid modifying CI script
 Map<String, String> versions = [
-        'release/1.33.0': '1.33',
+        'release/1.33.1': '1.33',
         'release/1.32.1': '1.32',
         'release/1.31.4': '1.31',
         'release/1.30.2': '1.30',

changelog.rst

@@ -21,6 +21,14 @@ Check https://github.com/conan-io/conan for issues and more details about develo
     Conan 1.33 shouldn't break any existing 1.0 recipe or command line invocation. If it does, please
     submit a report on GitHub. Read more about the :ref:`Conan stability commitment<stability>`.
 
+1.33.1 (02-Feb-2021)
+--------------------
+
+- Fix: Rename _conan.cfg_ to _global.conf_. `#8422 <https://github.com/conan-io/conan/pull/8422>`_ . Docs `here <https://github.com/conan-io/docs/pull/2008>`__
+- Fix: Make CMakeDeps generator available in declarative mode ``generators = "CMakeDeps"`` `#8416 <https://github.com/conan-io/conan/pull/8416>`_
+- Fix: Make the new Macos subsystem Catalyst lowercase to be consistent with existing subsystems. `#8389 <https://github.com/conan-io/conan/pull/8389>`_ . Docs `here <https://github.com/conan-io/docs/pull/2009>`__
+- BugFix: Fix Apple Catalyst flags. `#8389 <https://github.com/conan-io/conan/pull/8389>`_ . Docs `here <https://github.com/conan-io/docs/pull/2009>`__
+
 1.33.0 (20-Jan-2021)
 --------------------
 

conf.py

@@ -43,7 +43,7 @@
 # The short X.Y version.
 version = "1.33"
 # The full version, including alpha/beta/rc tags.
-release = u'1.33.0'
+release = u'1.33.1'
 
 dir_path = os.path.dirname(os.path.realpath(__file__))
 if not os.path.exists(os.path.join(dir_path, "versions.json")):

reference/config_files.rst

@@ -12,7 +12,7 @@ These are the most important configuration files, used to customize conan.
    config_files/artifacts.properties
    config_files/client_certificates
    config_files/conan.conf
-   config_files/conan_cfg
+   config_files/global_conf
    config_files/conandata.yml
    config_files/default_profile
    config_files/editable_layout

reference/config_files/conan_cfg.rst → reference/config_files/global_conf.rst

@@ -1,14 +1,14 @@
-.. _conan_cfg:
+.. _global_conf:
 
-conan.cfg
-=========
+global.conf
+===========
 
 .. warning::
 
     This new configuration mechanism is an **experimental** feature subject to breaking changes in future releases.
 
 
-The **conan.cfg** file is located in the Conan user home directory.
+The **global.conf** file is located in the Conan user home directory.
 
 Global configuration
 --------------------
@@ -21,8 +21,8 @@ Global configuration
 Tools configurations
 --------------------
 
-Tools and user configurations allows them to be defined both in the *conan.cfg* file and in profile files. Profile values will
-have priority over globally defined ones in *conan.cfg*, and can be defined as:
+Tools and user configurations allows them to be defined both in the *global.conf* file and in profile files. Profile values will
+have priority over globally defined ones in *global.conf*, and can be defined as:
 
 .. code-block:: text
 

reference/config_files/settings.yml.rst

@@ -32,7 +32,7 @@ are possible. These are the **default** values, but it is possible to customize
         Macos:
             version: [None, "10.6", "10.7", "10.8", "10.9", "10.10", "10.11", "10.12", "10.13", "10.14", "10.15", "11.0"]
             sdk: [None, "macosx"]
-            subsystem: [None, "Catalyst"]
+            subsystem: [None, catalyst]
         Android:
             api_level: ANY
         iOS: