Skip to content

Commit 13b2c19

Browse files
authored
Merge pull request #140 from AndreasGocht/update_ci
Update CI and move to setuptools
2 parents 00a9e13 + ed5d6d3 commit 13b2c19

4 files changed

Lines changed: 9 additions & 8 deletions

File tree

.github/workflows/publish.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111
- uses: actions/checkout@master
1212

1313

14-
- name: Set up Python 3.7
14+
- name: Set up Python 3.8
1515
uses: actions/setup-python@v1
1616
with:
17-
python-version: 3.7
17+
python-version: 3.8
1818
- name: Check Version
1919
run: test ${{ github.event.release.tag_name }} = `python -c "import scorep._version; print('v'+scorep._version.__version__)"`
2020

@@ -35,7 +35,7 @@ jobs:
3535
run: >-
3636
python -m
3737
build --sdist --outdir dist/ .
38-
- name: Publish distribution 📦 to Test PyPI
38+
- name: Publish distribution 📦 to PyPI
3939
uses: pypa/gh-action-pypi-publish@master
4040
with:
4141
password: ${{ secrets.PYPI_API_TOKEN }}

.github/workflows/unit_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
strategy:
1111
matrix:
12-
python: [2.7, 3.5, 3.6, 3.7, 3.8, 'pypy-2.7', 'pypy-3.6', 'pypy-3.7']
12+
python: ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", 'pypy-2.7', 'pypy-3.6', 'pypy-3.7', 'pypy-3.8']
1313
fail-fast: false
1414

1515
steps:

scorep/subsystem.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import os
2-
import distutils.ccompiler
2+
import setuptools.command.build_ext
33
import tempfile
44
import shutil
55

@@ -86,7 +86,7 @@ def generate(scorep_config, keep_files=False):
8686

8787
subsystem_lib_name = generate_subsystem_lib_name()
8888

89-
cc = distutils.ccompiler.new_compiler()
89+
cc = setuptools.command.build_ext.new_compiler()
9090
compiled_subsystem = cc.compile(
9191
[temp_dir + "/scorep_init.c"], output_dir=temp_dir)
9292
cc.link(

setup.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import os
22
import sys
3-
from distutils.core import setup, Extension
3+
from setuptools import setup, Extension
44
import scorep.helper
55
from scorep.instrumenter import has_c_instrumenter
66

@@ -74,7 +74,7 @@
7474
packages=["scorep", "scorep._instrumenters"],
7575
ext_modules=cmodules,
7676
classifiers=[
77-
"Development Status :: 4 - Beta",
77+
"Development Status :: 5 - Production/Stable",
7878
"Environment :: Console",
7979
"Intended Audience :: Developers",
8080
"Topic :: Software Development :: Testing",
@@ -88,6 +88,7 @@
8888
"Programming Language :: Python :: 3.7",
8989
"Programming Language :: Python :: 3.8",
9090
"Programming Language :: Python :: 3.9",
91+
"Programming Language :: Python :: 3.10",
9192
"Programming Language :: Python :: Implementation :: CPython",
9293
"Programming Language :: Python :: Implementation :: PyPy",
9394
"Operating System :: POSIX",

0 commit comments

Comments
 (0)