New Release Prep (#58)

* Fix up CI coverage * Fix up package `pipy` metadata
iris-hep · Feb 15, 2023 · e707eb7 · e707eb7
1 parent 5692498
commit e707eb7
Show file tree

Hide file tree

Showing 3 changed files with 84 additions and 83 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -5,34 +5,34 @@ on:
   pull_request:
   # Run daily at 0:01 UTC
   schedule:
-  - cron:  '1 0 * * 0'
+    - cron: "1 0 * * 0"
 
 jobs:
   flake8:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python 3.8
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3.8
-    - name: Install dependencies
-      env:
-        func_adl_servicex_version: 1.0a1
-      run: |
-        python -m pip install --upgrade pip setuptools wheel
-        pip install --no-cache-dir -e .[test]
-        pip list
-    - name: Lint with Flake8
-      if: matrix.python-version == 3.7 && matrix.platform == 'ubuntu-latest'
-      run: |
-        flake8 --exclude=tests/* --ignore=E501
-    - name: Check for vulnerable libraries
-      if: matrix.python-version == 3.7 && matrix.platform == 'ubuntu-latest'
-      run: |
-        pip install safety
-        pip freeze | safety check
+      - uses: actions/checkout@v3
+      - name: Set up Python 3.8
+        uses: actions/setup-python@v4
+        with:
+          python-version: 3.8
+      - name: Install dependencies
+        env:
+          func_adl_servicex_version: 1.0a1
+        run: |
+          python -m pip install --upgrade pip setuptools wheel
+          pip install --no-cache-dir -e .[test]
+          pip list
+      - name: Lint with Flake8
+        if: matrix.python-version == 3.7 && matrix.platform == 'ubuntu-latest'
+        run: |
+          flake8 --exclude=tests/* --ignore=E501
+      - name: Check for vulnerable libraries
+        if: matrix.python-version == 3.7 && matrix.platform == 'ubuntu-latest'
+        run: |
+          pip install safety
+          pip freeze | safety check
 
   test-non-local:
     strategy:
@@ -41,52 +41,52 @@ jobs:
         python-version: [3.9]
     runs-on: ${{ matrix.platform }}
     needs: flake8
- 
+
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install dependencies
-      env:
-        func_adl_servicex_version: 1.0a1
-      run: |
-        python -m pip install --upgrade pip setuptools wheel
-        pip install --no-cache-dir -e .[test]
-        pip list
-    - name: Test with pytest
-      run: |
-        python -m pytest
+      - uses: actions/checkout@v3
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        env:
+          func_adl_servicex_version: 1.0a1
+        run: |
+          python -m pip install --upgrade pip setuptools wheel
+          pip install --no-cache-dir -e .[test]
+          pip list
+      - name: Test with pytest
+        run: |
+          python -m pytest
 
   test-local:
     strategy:
       matrix:
         platform: [ubuntu-latest, macOS-latest, windows-latest]
-        python-version: [3.7, 3.8, 3.9, "3.10"]
+        python-version: [3.7, 3.8, 3.9, "3.10", 3.11]
     runs-on: ${{ matrix.platform }}
     needs: flake8
- 
+
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install dependencies
-      env:
-        func_adl_servicex_version: 1.0a1
-      run: |
-        python -m pip install --upgrade pip setuptools wheel
-        pip install --no-cache-dir -e .[test,local]
-        pip list
-    - name: Test with pytest
-      run: |
-        python -m pytest
-    - name: Report coverage with Codecov
-      if: github.event_name == 'push' && matrix.python-version == 3.9 && matrix.platform == 'ubuntu-latest'
-      uses: codecov/codecov-action@v1
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        file: ./coverage.xml
-        flags: unittests
+      - uses: actions/checkout@v3
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        env:
+          func_adl_servicex_version: 1.0a1
+        run: |
+          python -m pip install --upgrade pip setuptools wheel
+          pip install --no-cache-dir -e .[test,local]
+          pip list
+      - name: Test with pytest
+        run: |
+          python -m pytest
+      - name: Report coverage with Codecov
+        if: github.event_name == 'push' && matrix.python-version == 3.9 && matrix.platform == 'ubuntu-latest'
+        uses: codecov/codecov-action@v3
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          files: ./coverage.xml
+          flags: unittests
diff --git a/.github/workflows/pypi.yaml b/.github/workflows/pypi.yaml
@@ -9,21 +9,21 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3.7
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip build
-    - name: Build the func_adl_servicex wheel
-      env:
-        func_adl_servicex_version: ${{ github.ref }}
-      run: |
-        python -m build --sdist --wheel
-    - name: Publish func_adl_servicex to PyPI
-      uses: pypa/gh-action-pypi-publish@v1.3.1
-      with:
-        user: __token__
-        password: ${{ secrets.pypi_password_func_adl_servicex }}
+      - uses: actions/checkout@v3
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: 3.7
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip build
+      - name: Build the func_adl_servicex wheel
+        env:
+          func_adl_servicex_version: ${{ github.ref }}
+        run: |
+          python -m build --sdist --wheel
+      - name: Publish func_adl_servicex to PyPI
+        uses: pypa/gh-action-pypi-publish@v1.3.1
+        with:
+          user: __token__
+          password: ${{ secrets.pypi_password_func_adl_servicex }}
diff --git a/setup.py b/setup.py
@@ -28,7 +28,7 @@
     url="https://github.com/iris-hep/func_adl_servicex",
     license="TBD",
     test_suite="tests",
-    install_requires=["func_adl>=3.2", "qastle>=0.10", "servicex>=2.6.1b1,<2.6.2"],
+    install_requires=["func_adl>=3.2", "qastle>=0.10", "servicex>=2.6.1"],
     extras_require={
         "test": [
             "pytest>=3.9",
@@ -51,12 +51,13 @@
     },
     classifiers=[
         # "Development Status :: 3 - Alpha",
-        "Development Status :: 4 - Beta",
-        # "Development Status :: 5 - Production/Stable",
+        # "Development Status :: 4 - Beta",
+        "Development Status :: 5 - Production/Stable",
         # "Development Status :: 6 - Mature",
         "Intended Audience :: Developers",
         "Intended Audience :: Information Technology",
         "Programming Language :: Python",
+        "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.8",