Merge pull request #137 from zmoon/aqs

AQS now doesn't need special OpenSSL treatment
noaa-oar-arl · Oct 3, 2023 · 1dcf228 · 1dcf228
2 parents 1e3b9fe + cd4530f
commit 1dcf228
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 37 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,45 +11,29 @@ on:
 
 jobs:
   test:
-    name: Test (Py ${{ matrix.python-version }}${{ matrix.aqs && ', AQS' || '' }})
+    name: Test (Py ${{ matrix.python-version }})
     runs-on: ubuntu-latest
     if: github.repository == 'noaa-oar-arl/monetio'
     strategy:
       matrix:
-        python-version: ["3.8", "3.10"]
-        aqs: [false]
-        include:
-          - python-version: "3.6"
-            aqs: true
-          - python-version: "3.10"
-            aqs: true
+        python-version: ["3.6", "3.8", "3.10"]
     defaults:
       run:
         shell: bash -l {0}
 
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set up Python (micromamba) [>3.6, no AQS]
-        if: matrix.python-version != '3.6' && !matrix.aqs
+      - name: Set up Python (micromamba) [>3.6]
+        if: matrix.python-version != '3.6'
         uses: mamba-org/setup-micromamba@v1
         with:
           environment-file: environment-dev.yml
           cache-environment: true
           create-args: >-
             python=${{ matrix.python-version }}
 
-      - name: Set up Python (micromamba) [>3.6, AQS]
-        if: matrix.python-version != '3.6' && matrix.aqs
-        uses: mamba-org/setup-micromamba@v1
-        with:
-          environment-file: environment-dev.yml
-          cache-environment: true
-          create-args: >-
-            python=${{ matrix.python-version }}
-            openssl=1.1.1w
-
-      - name: Set up Python (micromamba) [3.6, AQS]
+      - name: Set up Python (micromamba) [3.6]
         if: matrix.python-version == '3.6'
         uses: mamba-org/setup-micromamba@v1
         with:
@@ -58,7 +42,6 @@ jobs:
           create-args: >-
             python=${{ matrix.python-version }}
             attrs=22.2.0
-            openssl=1.1.1w
 
       - name: Test with pytest
         run: pytest -n auto -v
@@ -68,11 +51,6 @@ jobs:
           pip install https://github.com/noaa-oar-arl/pytspack/archive/master.zip
           pytest -n auto -v -k with_pytspack
 
-      - name: Test AQS
-        if: matrix.aqs
-        run: |
-          pytest -n auto -v -k aqs
-
   docs:
     name: Check docs build
     runs-on: ubuntu-latest
@@ -89,8 +67,6 @@ jobs:
         with:
           environment-file: docs/environment-docs.yml
           cache-environment: true
-          create-args: >-
-            openssl=1.1.1w
 
       - name: linkcheck
         run: sphinx-build -b linkcheck docs docs/_build/linkcheck

diff --git a/tests/test_aqs.py b/tests/test_aqs.py
@@ -1,17 +1,9 @@
-import ssl
-
 import pandas as pd
 import pytest
-from requests.exceptions import SSLError
 
 from monetio import aqs
 
-ssl_version = ssl.OPENSSL_VERSION_INFO
-
 
-@pytest.mark.xfail(
-    not ssl_version < (2,), strict=False, reason="Doesn't work with newer OpenSSL", raises=SSLError
-)
 def test_aqs():
     # For MM data proc example
     dates = pd.date_range(start="2019-08-01", end="2019-08-31", freq="H")