Merge pull request #42 from memgraph/MG-prepare-release-1.3.0

Prepare release 1.3.0

Author: antaljanosbenjamin

.github/workflows/ci.yml

@@ -90,7 +90,7 @@ jobs:
         run: python3 -c "import mgclient"
 
   build_windows_and_test:
-    runs-on: windows-latest
+    runs-on: windows-2019
     strategy:
       matrix:
         arch:
@@ -159,8 +159,8 @@ jobs:
           - '3.7'
           - '3.10'
         include:
-          - {platform: [macOS-11.6, ARM64, self-hosted], python_version: '3.8'}
           - {platform: [macOS-11.6, ARM64, self-hosted], python_version: '3.10'}
+          - {platform: [macOS-11.6, ARM64, self-hosted], python_version: '3.8'}
     runs-on: ${{ matrix.platform }}
     steps:
       - uses: actions/checkout@v2
@@ -174,7 +174,7 @@ jobs:
         run: brew install openssl@3
       - name: Make used python version default
         run: |
-          brew link --force --overwrite python@${{ matrix.python_version }}
+          brew unlink python@3 && brew link python@${{ matrix.python_version }}
           python3 --version
       - name: Install pytest and pyopenssl
         run: python3 -m pip install pyopenssl pytest
@@ -184,13 +184,13 @@ jobs:
         run: python3 -m pip install -f dist --no-index pymgclient
       - name: Import mgclient to validate installation
         run: python3 -c "import mgclient"
-      - name: Save artifact name on not ARM64 machines
+      - name: Save artifact name on x86 machines
         if: ${{ !contains(matrix.platform, 'ARM64') }}
         run: echo "OS_TYPE=${{ matrix.platform }}" >> $GITHUB_ENV
-      - name: Save artifact name on ARM64 machine
+      - name: Save artifact name on ARM64 machines
         if: ${{ contains(matrix.platform, 'ARM64') }}
         # Convert macOS-11.6-ARM64 to macos-11.6-arm64 to be consistent with full lowercase naming
-        run: echo "OS_TYPE=${{ matrix.platform[0] }}-${{ matrix.platform[1] }}" | tr '[:upper:]' '[:lower:]' >> $GITHUB_ENV
+        run: echo OS_TYPE=`echo "${{ matrix.platform[0] }}-${{ matrix.platform[1] }}" | tr "[:upper:]" "[:lower:]"` >> $GITHUB_ENV
       - name: Save wheel package
         uses: actions/upload-artifact@v2
         with:

.github/workflows/release.yml

@@ -10,8 +10,12 @@ on:
         description: 'If set to true, then the documentation will be published.'
         default: 'false'
         required: false
-      openssl_version:
-        description: 'The expected version of OpenSSL.'
+      openssl_1_version:
+        description: 'The expected version of OpenSSL 1, e.g.: 1.1.1o.'
+        required: true
+        type: string
+      openssl_3_version:
+        description: 'The expected version of OpenSSL 3, e.g.: 3.0.3.'
         required: true
         type: string
 
@@ -65,7 +69,7 @@ jobs:
         publish_dir: ./docs/build/html
 
   build_windows_and_test:
-    runs-on: windows-latest
+    runs-on: windows-2019
     strategy:
       matrix:
         arch:
@@ -104,7 +108,7 @@ jobs:
       - name: Check version
         shell: msys2 {0}
         run: |
-          [ `openssl version -v | cut -d ' ' -f 2` == "${{ github.event.inputs.openssl_version }}" ]
+          [ `openssl version -v | cut -d ' ' -f 2` == "${{ github.event.inputs.openssl_1_version }}" ]
       - uses: Vampire/setup-wsl@v1
         with:
             distribution: Ubuntu-18.04
@@ -146,26 +150,38 @@ jobs:
           - '3.9'
           - '3.10'
         include:
-          - {platform: [macos-11.6, arm64], python_version: '3.10'}
+          - {platform: [macOS-11.6, ARM64, self-hosted], python_version: '3.10'}
+          - {platform: [macOS-11.6, ARM64, self-hosted], python_version: '3.9'}
+          - {platform: [macOS-11.6, ARM64, self-hosted], python_version: '3.8'}
     runs-on: ${{ matrix.platform }}
     steps:
       - uses: actions/checkout@v2
         with:
           submodules: true
-      - name: Install python and OpenSSL
+      - name: Install python
         run: |
           brew update
-          brew install python@${{ matrix.python_version }} [email protected]
-          brew upgrade [email protected]
-      - name: Print OpenSSL version
+          brew install python@${{ matrix.python_version }}
+      - name: Manage OpenSSL 1 on x86 machines
+        if: ${{ !contains(matrix.platform, 'ARM64') }}
         run: |
+          brew uninstall -f openssl@3
+          brew install [email protected]
+          brew upgrade [email protected]
+          brew link --force --overwrite [email protected]
           openssl version -a
-      - name: Check version
+          [ `openssl version -v | cut -d ' ' -f 2` == "${{ github.event.inputs.openssl_1_version }}" ]
+      - name: Manage OpenSSL 3 on ARM machines
+        if: ${{ contains(matrix.platform, 'ARM64') }}
         run: |
-          [ `openssl version -v | cut -d ' ' -f 2` == "${{ github.event.inputs.openssl_version }}" ]
+          brew install openssl@3
+          brew upgrade openssl@3
+          brew link --force --overwrite openssl@3
+          openssl version -a
+          [ `openssl version -v | cut -d ' ' -f 2` == "${{ github.event.inputs.openssl_3_version }}" ]
       - name: Make used python version default
         run: |
-          brew link --force --overwrite python@${{ matrix.python_version }}
+          brew unlink python@3 && brew link python@${{ matrix.python_version }}
           python3 --version
       - name: Install pytest and pyopenssl
         run: python3 -m pip install pyopenssl pytest
@@ -175,12 +191,13 @@ jobs:
         run: python3 -m pip install -f dist --no-index pymgclient
       - name: Import mgclient to validate installation
         run: python3 -c "import mgclient"
-      - name: Save artifact name on not ARM64 machines
-        if: ${{ startsWith(matrix.platform, 'macos') }}
+      - name: Save artifact name on x86 machines
+        if: ${{ !contains(matrix.platform, 'ARM64') }}
         run: echo "OS_TYPE=${{ matrix.platform }}" >> $GITHUB_ENV
-      - name: Save artifact name on ARM64 machine
-        if: ${{ !startsWith(matrix.platform, 'macos') }}
-        run: echo "OS_TYPE=${{ matrix.platform[0] }}-${{ matrix.platform[1] }}" >> $GITHUB_ENV
+      - name: Save artifact name on ARM64 machines
+        if: ${{ contains(matrix.platform, 'ARM64') }}
+        # Convert macOS-11.6-ARM64 to macos-11.6-arm64 to be consistent with full lowercase naming
+        run: echo OS_TYPE=`echo "${{ matrix.platform[0] }}-${{ matrix.platform[1] }}" | tr "[:upper:]" "[:lower:]"` >> $GITHUB_ENV
       - name: Save wheel package
         uses: actions/upload-artifact@v2
         with:

CHANGELOG.rst

@@ -2,6 +2,19 @@
 Changelog
 =========
 
+######
+1.3.0
+######
+
+
+******************************
+Major Feature and Improvements
+******************************
+
+  * mgclient has been updated to 1.4.0
+  * Support for OpenSSL 3
+  * Use OpenSSL 1.1.1o and 3.0.3 versions for binary packages
+
 ######
 1.2.1
 ######

docs/source/conf.py

@@ -23,7 +23,7 @@
 author = "Memgraph Ltd."
 
 # The full version, including alpha/beta/rc tags
-release = "1.2.1"
+release = "1.3.0"
 
 
 # -- General configuration ---------------------------------------------------

docs/source/introduction.rst

@@ -78,7 +78,7 @@ build it from you will need:
 * Preqrequisites of `mgclient`_:
 
   * CMake 3.8 or newer
-  * OpenSSL 1.0.2 or newer (but not OpenSSL 3.0) and its header files
+  * OpenSSL 1.0.2 or newer (including OpenSSL 3.0.0+) and its header files
 
 Building on Linux
 *****************
@@ -119,7 +119,7 @@ To install the C/C++ compiler, run::
 
 The rest of the build prerequisites can be installed easily via `brew`_::
 
-  $ brew install python3 openssl@1.1 cmake
+  $ brew install python3 openssl cmake
 
 It is important to mention that on M1/ARM machines pymgclient cannot be built
 with the default installed Python version, thus Python needs to be installed via

setup.py

@@ -54,7 +54,7 @@
 
 static_openssl = parser.getboolean("build_ext", "static_openssl", fallback=False)
 
-version = os.getenv("PYMGCLIENT_OVERRIDE_VERSION", "1.2.1")
+version = os.getenv("PYMGCLIENT_OVERRIDE_VERSION", "1.3.0")
 
 
 def list_all_files_in_dir(path):