Skip to content
This repository was archived by the owner on May 20, 2025. It is now read-only.

Commit e707eb7

Browse files
gordonwattsgordonwatts
authored
New Release Prep (#58)
* Fix up CI coverage * Fix up package `pipy` metadata
1 parent 5692498 commit e707eb7

File tree

3 files changed

+84
-83
lines changed

3 files changed

+84
-83
lines changed

‎.github/workflows/ci.yaml

Lines changed: 62 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -5,34 +5,34 @@ on:
55
pull_request:
66
# Run daily at 0:01 UTC
77
schedule:
8-
- cron: '1 0 * * 0'
8+
- cron: "1 0 * * 0"
99

1010
jobs:
1111
flake8:
1212
runs-on: ubuntu-latest
1313

1414
steps:
15-
- uses: actions/checkout@v2
16-
- name: Set up Python 3.8
17-
uses: actions/setup-python@v2
18-
with:
19-
python-version: 3.8
20-
- name: Install dependencies
21-
env:
22-
func_adl_servicex_version: 1.0a1
23-
run: |
24-
python -m pip install --upgrade pip setuptools wheel
25-
pip install --no-cache-dir -e .[test]
26-
pip list
27-
- name: Lint with Flake8
28-
if: matrix.python-version == 3.7 && matrix.platform == 'ubuntu-latest'
29-
run: |
30-
flake8 --exclude=tests/* --ignore=E501
31-
- name: Check for vulnerable libraries
32-
if: matrix.python-version == 3.7 && matrix.platform == 'ubuntu-latest'
33-
run: |
34-
pip install safety
35-
pip freeze | safety check
15+
- uses: actions/checkout@v3
16+
- name: Set up Python 3.8
17+
uses: actions/setup-python@v4
18+
with:
19+
python-version: 3.8
20+
- name: Install dependencies
21+
env:
22+
func_adl_servicex_version: 1.0a1
23+
run: |
24+
python -m pip install --upgrade pip setuptools wheel
25+
pip install --no-cache-dir -e .[test]
26+
pip list
27+
- name: Lint with Flake8
28+
if: matrix.python-version == 3.7 && matrix.platform == 'ubuntu-latest'
29+
run: |
30+
flake8 --exclude=tests/* --ignore=E501
31+
- name: Check for vulnerable libraries
32+
if: matrix.python-version == 3.7 && matrix.platform == 'ubuntu-latest'
33+
run: |
34+
pip install safety
35+
pip freeze | safety check
3636
3737
test-non-local:
3838
strategy:
@@ -41,52 +41,52 @@ jobs:
4141
python-version: [3.9]
4242
runs-on: ${{ matrix.platform }}
4343
needs: flake8
44-
44+
4545
steps:
46-
- uses: actions/checkout@v2
47-
- name: Set up Python ${{ matrix.python-version }}
48-
uses: actions/setup-python@v2
49-
with:
50-
python-version: ${{ matrix.python-version }}
51-
- name: Install dependencies
52-
env:
53-
func_adl_servicex_version: 1.0a1
54-
run: |
55-
python -m pip install --upgrade pip setuptools wheel
56-
pip install --no-cache-dir -e .[test]
57-
pip list
58-
- name: Test with pytest
59-
run: |
60-
python -m pytest
46+
- uses: actions/checkout@v3
47+
- name: Set up Python ${{ matrix.python-version }}
48+
uses: actions/setup-python@v4
49+
with:
50+
python-version: ${{ matrix.python-version }}
51+
- name: Install dependencies
52+
env:
53+
func_adl_servicex_version: 1.0a1
54+
run: |
55+
python -m pip install --upgrade pip setuptools wheel
56+
pip install --no-cache-dir -e .[test]
57+
pip list
58+
- name: Test with pytest
59+
run: |
60+
python -m pytest
6161
6262
test-local:
6363
strategy:
6464
matrix:
6565
platform: [ubuntu-latest, macOS-latest, windows-latest]
66-
python-version: [3.7, 3.8, 3.9, "3.10"]
66+
python-version: [3.7, 3.8, 3.9, "3.10", 3.11]
6767
runs-on: ${{ matrix.platform }}
6868
needs: flake8
69-
69+
7070
steps:
71-
- uses: actions/checkout@v2
72-
- name: Set up Python ${{ matrix.python-version }}
73-
uses: actions/setup-python@v2
74-
with:
75-
python-version: ${{ matrix.python-version }}
76-
- name: Install dependencies
77-
env:
78-
func_adl_servicex_version: 1.0a1
79-
run: |
80-
python -m pip install --upgrade pip setuptools wheel
81-
pip install --no-cache-dir -e .[test,local]
82-
pip list
83-
- name: Test with pytest
84-
run: |
85-
python -m pytest
86-
- name: Report coverage with Codecov
87-
if: github.event_name == 'push' && matrix.python-version == 3.9 && matrix.platform == 'ubuntu-latest'
88-
uses: codecov/codecov-action@v1
89-
with:
90-
token: ${{ secrets.CODECOV_TOKEN }}
91-
file: ./coverage.xml
92-
flags: unittests
71+
- uses: actions/checkout@v3
72+
- name: Set up Python ${{ matrix.python-version }}
73+
uses: actions/setup-python@v4
74+
with:
75+
python-version: ${{ matrix.python-version }}
76+
- name: Install dependencies
77+
env:
78+
func_adl_servicex_version: 1.0a1
79+
run: |
80+
python -m pip install --upgrade pip setuptools wheel
81+
pip install --no-cache-dir -e .[test,local]
82+
pip list
83+
- name: Test with pytest
84+
run: |
85+
python -m pytest
86+
- name: Report coverage with Codecov
87+
if: github.event_name == 'push' && matrix.python-version == 3.9 && matrix.platform == 'ubuntu-latest'
88+
uses: codecov/codecov-action@v3
89+
with:
90+
token: ${{ secrets.CODECOV_TOKEN }}
91+
files: ./coverage.xml
92+
flags: unittests

‎.github/workflows/pypi.yaml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,21 @@ jobs:
99
runs-on: ubuntu-latest
1010

1111
steps:
12-
- uses: actions/checkout@v2
13-
- name: Set up Python
14-
uses: actions/setup-python@v2
15-
with:
16-
python-version: 3.7
17-
- name: Install dependencies
18-
run: |
19-
python -m pip install --upgrade pip build
20-
- name: Build the func_adl_servicex wheel
21-
env:
22-
func_adl_servicex_version: ${{ github.ref }}
23-
run: |
24-
python -m build --sdist --wheel
25-
- name: Publish func_adl_servicex to PyPI
26-
uses: pypa/gh-action-pypi-publish@v1.3.1
27-
with:
28-
user: __token__
29-
password: ${{ secrets.pypi_password_func_adl_servicex }}
12+
- uses: actions/checkout@v3
13+
- name: Set up Python
14+
uses: actions/setup-python@v4
15+
with:
16+
python-version: 3.7
17+
- name: Install dependencies
18+
run: |
19+
python -m pip install --upgrade pip build
20+
- name: Build the func_adl_servicex wheel
21+
env:
22+
func_adl_servicex_version: ${{ github.ref }}
23+
run: |
24+
python -m build --sdist --wheel
25+
- name: Publish func_adl_servicex to PyPI
26+
uses: pypa/gh-action-pypi-publish@v1.3.1
27+
with:
28+
user: __token__
29+
password: ${{ secrets.pypi_password_func_adl_servicex }}

‎setup.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
url="https://github.com/iris-hep/func_adl_servicex",
2929
license="TBD",
3030
test_suite="tests",
31-
install_requires=["func_adl>=3.2", "qastle>=0.10", "servicex>=2.6.1b1,<2.6.2"],
31+
install_requires=["func_adl>=3.2", "qastle>=0.10", "servicex>=2.6.1"],
3232
extras_require={
3333
"test": [
3434
"pytest>=3.9",
@@ -51,12 +51,13 @@
5151
},
5252
classifiers=[
5353
# "Development Status :: 3 - Alpha",
54-
"Development Status :: 4 - Beta",
55-
# "Development Status :: 5 - Production/Stable",
54+
# "Development Status :: 4 - Beta",
55+
"Development Status :: 5 - Production/Stable",
5656
# "Development Status :: 6 - Mature",
5757
"Intended Audience :: Developers",
5858
"Intended Audience :: Information Technology",
5959
"Programming Language :: Python",
60+
"Programming Language :: Python :: 3.11",
6061
"Programming Language :: Python :: 3.10",
6162
"Programming Language :: Python :: 3.9",
6263
"Programming Language :: Python :: 3.8",

0 commit comments

Comments
 (0)