Skip to content

Commit 6f8c36e

Browse files
authored
Merge pull request #179 from pyutils/fix-dashboards
Fix dashboards
2 parents fe0bb5a + 18176d0 commit 6f8c36e

File tree

10 files changed

+116
-114
lines changed

10 files changed

+116
-114
lines changed

.circleci/config.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
.common_template: &common_template
3737
docker:
38-
- image: circleci/python
38+
- image: cimg/python
3939
steps:
4040
- checkout
4141

@@ -60,7 +60,7 @@ jobs:
6060
VERSION=$(python -c "import setup; print(setup.VERSION)")
6161
export CIBW_BUILD="${MB_PYTHON_TAG}-*"
6262
docker info
63-
pip install cibuildwheel
63+
pip install -r requirements/build.txt
6464
cibuildwheel --platform=linux --arch=native
6565
- persist_to_workspace:
6666
root: .
@@ -97,31 +97,31 @@ jobs:
9797
environment:
9898
- MB_PYTHON_TAG=cp39
9999
docker:
100-
- image: circleci/python:3.9
100+
- image: cimg/python:3.9
101101
working_directory: ~/repo-full-cp39
102102

103103
test_full/cp38-cp38-manylinux2010:
104104
<<: *test_full_template
105105
environment:
106106
- MB_PYTHON_TAG=cp38
107107
docker:
108-
- image: circleci/python:3.8
108+
- image: cimg/python:3.8
109109
working_directory: ~/repo-full-cp38
110110

111111
test_full/cp37-cp37m-manylinux2010:
112112
<<: *test_full_template
113113
environment:
114114
- MB_PYTHON_TAG=cp37
115115
docker:
116-
- image: circleci/python:3.7
116+
- image: cimg/python:3.7
117117
working_directory: ~/repo-full-cp37
118118

119119
test_full/cp36-cp36m-manylinux2010:
120120
<<: *test_full_template
121121
environment:
122122
- MB_PYTHON_TAG=cp36
123123
docker:
124-
- image: circleci/python:3.6
124+
- image: cimg/python:3.6
125125
working_directory: ~/repo-full-cp36
126126

127127

.github/workflows/tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Checkout source
1818
uses: actions/checkout@v3
1919
- name: Set up Python 3.8
20-
uses: actions/setup-python@v4.2.0
20+
uses: actions/setup-python@v4.3.0
2121
with:
2222
python-version: 3.8
2323
- name: Install dependencies
@@ -40,7 +40,7 @@ jobs:
4040
- name: Checkout source
4141
uses: actions/checkout@v3
4242
- name: Set up Python 3.8
43-
uses: actions/setup-python@v4.2.0
43+
uses: actions/setup-python@v4.3.0
4444
with:
4545
python-version: 3.8
4646
- name: Upgrade pip
@@ -127,7 +127,7 @@ jobs:
127127
with:
128128
platforms: all
129129
- name: Build binary wheels
130-
uses: pypa/cibuildwheel@v2.9.0
130+
uses: pypa/cibuildwheel@v2.10.0
131131
with:
132132
output-dir: wheelhouse
133133
config-file: pyproject.toml
@@ -138,7 +138,7 @@ jobs:
138138
shell: bash
139139
run: ls -la wheelhouse
140140
- name: Set up Python 3.8 to combine coverage Linux
141-
uses: actions/setup-python@v4.2.0
141+
uses: actions/setup-python@v4.3.0
142142
if: runner.os == 'Linux'
143143
with:
144144
python-version: 3.8

comp.py

Lines changed: 0 additions & 29 deletions
This file was deleted.

dev/ci_public_gpg_key.pgp.enc

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
1-
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

dev/ci_secret_gpg_subkeys.pgp.enc

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
U2FsdGVkX1+e9LWZeD/TOTnPwr+m2TgW05W+m3IdvfSSBQxY/Xgfpm5oTp/33iE7
2-
n5E3ZMw2UkoqScNmmAIsQnGdh9q8Or2algaClA3qaIecg5i9VQmaN0xD4hq6prTR
3-
Rs3HnAChTYD0E/2HOhcD8jau1x2m6amh6LbYGlx6rmhxWc1YwDIRePXysZeqfiWv
4-
iACAFJoNroURLs23MRNfPrIdKzUWDKOe4qyGtHCXFhYrsvi8zfLRR+SwFGalrbdl
5-
aodEcjgnLxVxKFAa6m7HhC7DS7eDj6RguLEyYzGQDVQrXK9oN5MSgDVYlhzZwIM7
6-
3k5E6qsKjYWDLN8PF1w8DS+pb7H/DxdF2k91OS7DyJPG9ALz5mRhmnS+YziF2Izc
7-
5z5Nzw2fbQSwinPIrc11gtf9CQxUOnrGTlwaR8bU066MWn3wS5im8tGEVeIUL2pr
8-
EZq/8FKFKFibviPdxH+9KRA5DN/lcS1sSxRrRuL3HF3EZILDQuEKgIDFHWriw7K7
9-
OndFalEgdpKnHLNovd/cerXXf1z5ue+TBgt3QetskmobYNbRsY/2zSWbOU76WUpZ
10-
bj/+Xmla/rsKhKnJ7S86UZLD4oMWz+W1QCPjDbQyfOkI98QLmXP6tPomis+Stg8y
11-
HJqSFZlUmfb4xjDpsONmInhLgqrwQ8okf5blJ4DkTMJtnFeBZ7C0QSwvci1GdCjx
12-
EXaYKU/7VBPIqw6QFd3N/TTA01zuyJ/w9ttsNZJeoMUKIoatyJrJLBlDQOcOvDK/
13-
L8C1dNN29DPPufDWXbLOIiGHVJJdEmHhp9JUTSrySS6WWS/LTeIv0JllCDDfndtd
14-
IkRjea2u3AG2oamv0p7ygBeEqcDIltC83fIrBZ8XTkV0jDSOoMtplgmgJ/hNcj3A
15-
tsszP/J1H7W8eoyS08yMFxZpE4oSxlldeh7+GXxvfXdqvZga+OJ5LQ1cp0HHLyvE
16-
AlDI/CKfeKOSvC260my2OTf2vQennliRSrnOsSnvik+D9lH54qFvwivcHLkK37Ia
17-
sw41ryjusNZ0ergwTD4XpSfnrZ3eLpqkrL8eOR3uDEKpbsvg5CHG6pP8L3NjSM4T
18-
atgPr+OQ9cf5LzaPAWnyteCDQc2dTfQjw81V8Y6cYVLnxewn6MRvVhDTVVb80So6
19-
9P8WlwEjG2p6WF16V92LrmNRYCbNUDMzVEqI2MzJUkgx+WMchMmw5CetUVziwfW/
20-
kXrx0DQhOgf1iTbpzTN7pkJIO3dVfRKPgjvK7K7J+B+5ySXoVmprYZAAv1uCaM2v
21-
EGrH0FvKUClbGsKYsz9BbiEW9sQXxK2bvVphzfZQHa177SmrLnzktpcrrXiAvIL1
22-
qtfonY2ocnMQzOuUKRdtMPMWMSqgg38tkoESvyKFC9qYx4W6kvCjUQup5XnDFc+I
23-
MlpJ1qAtqW+viG9N2sdS6NQyblBU3t5jsIVUTYK2kt6kBK+EAWsbAdKG58N/nU2y
24-
bgiiYOIffhfNKKTIqz1etw==
1+
U2FsdGVkX1/pRjQeonOw8CdJoiHMQzb6Cv4CEJKTf1q5JaEcwQgfz+2Z7bNKr7yQ
2+
YvW4ydsaRVEuJ09NWqhdg+C46yJvJrQ9CAd7Flp4TLVxtczdY+YVoe2zejPAJbDR
3+
Rm/B/1egxwmFoKbiFy1DH6cZiZlpqwlX9nnY257Vquyu/4xv/w3ziOF3A0knQFwF
4+
3RjEMbnZXd1/zh5JdF9W3oAdn0dSfjDDf/jJZVyHb7riPnTyDN+NEgKRnqgLSm2x
5+
EUcJufhu2AiQQLhIZ2xu9ckHh0XXYrtsbvaEJgYbyvcyY4xDTIsjzH7MBs17Zjl8
6+
I6GyGQtYwLc4zEeC4Icna2WyyxNhP+D3G1hhFotXFzzWrDHOdCgeWmkKtE4xrpI5
7+
qa0FPJ6xIxoqZ5WOQMowRtERjB3dzCgRrp5wLPEBGkco/AKFd24ZT7qqv6Q438rA
8+
Q/Mza4i0JfCkUFn8weaAq6sAyDZ/ji9qJU3iNGc/lxQHbhRg1nuJOUNzy0NT/u0Q
9+
B5Ai0cj4xR1L3RWD5l6mHZAuXjSSHJyRpV9eSxpl1H+croqjujoCvtpDkXFBKJir
10+
/myY5DKW7eXcX9RWstv466SBKYJe25Ebpah60u0VnbBrnklQK0n6xVIrqzDQ19Oh
11+
lT7doHpPnKWfpbwkCrg+8RFpE38Us0Q6P4devpTo1oCR7wJt+r0uaefTI69eEnQR
12+
pSoW4f/0of1ITQOSx8s5Hna+gZNWUzD9rfMB3q3t0wC8JY5erj1FfjHVDv1UwxpD
13+
ATRqTYtQFutZPGs63TD0nXCkRf6SxGOQYkswo+e42WYqx+NBJcyGAi8Bu3hXZfBX
14+
5dDvfWTATinNs89K7TV2lb5VpGXN+dFNxx8GYKjOj/p40PB71/6+RCjn+JLEXoom
15+
V3xeJf5uxaX+F9bEN4YLiKND3b9zd08XuSsr6Ye3qZpkdl75x21jJfHS1A1wp1Nu
16+
yjsAFHphc489LkMG1QfmCVqgQ/gEzLrtfNNazgpotxiM5RHxtsLsep4V1yVn8kwG
17+
lBLxgIgsjiCI5SPGkI2NyimYASaewpvt8MO4G+GVydS+639x+1Y1oDqpbVASYr1J
18+
cqAShtKjdo6F4AsVLJXww89Mueq6dkIh5RzZRkdXFFhElXjAxaU6iq9KnZ26f2AF
19+
z6weArFd0isU/2fHm6Ll+tpZWI7FqsZkmAY73n6e8wFJA8wJHXufZH+t3YykgB9+
20+
NJtkxYGnfea33vJ7vzcS9GtTfFeaOv15X9tA7N4NHVupWXLE8Uy5YjuBek+Tyt8D
21+
K3Bs2n9naSowPp2Uhu4NXtpjFB1MrkarcwZw95y49mk/489FuBwDtPNWXpQ9iyAp
22+
+OLr9IJCWU6XVIzZptx7WmrjBdOzFFXhMniNtj1hdyQ4cdrFtgvQqrBjitp9MpWk
23+
gj+8L/ZoqzPxXtUyh9utdKwgAsfSb0fa8mV9h8FFxIjfuerqjYyof9Tw33w5kgel
24+
pw0jmKBIZJ1WWHqLjHDo2Q==

dev/gpg_owner_trust.enc

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
U2FsdGVkX18XP839v+tPsSvRgMrfTrarxw+KDTonJ5psyhMgw9vJckGiuDtOfUHR
2-
HICAUw7rPKeR1OX2A8BVnWv2K6i0abPl2/FhU1Ycne9uI/is03g2QN1xkLhf7t6m
3-
6dhZGJ18+Q4jOc7E0czcwze1xuys1owdgeHKfE4u5QL97e+TBtgkkzS9w0inwuNo
4-
ANL5GGc4ZuXnO5dRaS8Np5wsT9UM4cXmOGkNjE++5Aj3XWIofdcMoi0arThPyhA+
5-
J9IHk79ryDqfVWSUMRUN5OBEebb+h2IiLfCXTsIRneattWYePd0twEZM4/uGWfE4
6-
crGDbEPdpyMas/f8NtBX4jpnLAqwD156zCLt5w5JqCXSdv+nRbfpwYb4ZiUnnxID
7-
FiLS/wtvHeI8/Hb4882ELQvc7C2ELW1CUY9JsoVeHoSA9IZx/XgQt8N5fIoSbXza
8-
KkwlOHoX0OKNcsaYJNLdDXDvXoIOfZR+QPwK9qA5kpQLuxdvs2sXEIGyZkrjZis2
9-
HKr0hxZxGtA70J26evQHK9/y+6KxT01wDqkv8IedulZadXxrMHnmjO00ECH/97Oq
10-
Wm7sIPlNNQVu5xiBMTjjRw==
1+
U2FsdGVkX1/VV/oZL+0zJuZbiNgyUZSW8rfYJBPwP5miuereqn/I62Ya0Yd7QQAD
2+
Y+eb/PTMAHRTYrb6nGCig9WztCS5gdaYs2V7RwkGdfQOqeMOdm8tWOSRH21EVtc7
3+
zyg2EqSTjLyJQReWjf2c1U8AOM1HAp6ZzCnoZkqXIXC2vUDPPipLlTICzlMzytKD
4+
xxpuyl99N7ZIrpHo28Hy8LV9HTidx+OqV6PmzhoSxjiVG23FtflfSrsWh5zxTW8f
5+
ZsDrNielzg63V+IPjzRTP+KLrIxAWvuymKm5QDY/IbSxTuQbI5g8Dny9uOw0BzEW
6+
fHmOZjhEwLECJAhOONUh9VxFlc9SqvfOBMlaLd/HjTtD8pTwD11Zhv5YYdvbhIjw
7+
fgYLF/y6LExpS1B4qanYLvSx35h6c3COeB6AKjVPPBLNYBHBuGKifF1nWeYaSC8s
8+
SiaQ52I6rJdhHAzHR+5FyXlwALKPzGHIYL+chyYHt8g8mIZd131Wu/+6VQtkxb3r
9+
QcKZ8hYACJDTZBuqk11jWiOiFqRH0yOzyq1KUzVV72q4hmp+RLqFPOvTUB1iL7H9
10+
PsIC2D5+R5Mc2D1dCCbsFSRGYMRsaiORROJQEeZK+WpK0sN8zQTiP3/XomhWGUDF
11+
eWCqjUSYcxv3gVVzksJkbQ==

dev/setup_secrets.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,11 @@ export_encrypted_code_signing_keys(){
393393

394394
MAIN_GPG_KEYID=$(gpg --list-keys --keyid-format LONG "$GPG_IDENTIFIER" | head -n 2 | tail -n 1 | awk '{print $1}')
395395
GPG_SIGN_SUBKEY=$(gpg --list-keys --with-subkey-fingerprints "$GPG_IDENTIFIER" | grep "\[S\]" -A 1 | tail -n 1 | awk '{print $1}')
396+
# Careful, if you don't have a subkey, requesting it will export more than you want.
397+
# Export the main key instead (its better to have subkeys, but this is a lesser evil)
398+
if [[ "$GPG_SIGN_SUBKEY" == "" ]]; then
399+
GPG_SIGN_SUBKEY=$(gpg --list-keys --with-subkey-fingerprints "$GPG_IDENTIFIER" | grep "\[C\]" -A 1 | tail -n 1 | awk '{print $1}')
400+
fi
396401
echo "MAIN_GPG_KEYID = $MAIN_GPG_KEYID"
397402
echo "GPG_SIGN_SUBKEY = $GPG_SIGN_SUBKEY"
398403

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[build-system]
2-
requires = ["setuptools>=41.0.1", "wheel>=0.29.0", "Cython>=3.0.0a11"]
3-
# build-backend = "setuptools.build_meta" commented out to disable pep517
2+
requires = ["setuptools>=41.0.1", "wheel>=0.29.0", "Cython>=3.0.0a11"]
3+
build-backend = "setuptools.build_meta" # comment out to disable pep517
44

55
[tool.coverage.run]
66
branch = true

requirements/build.txt

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
Cython >= 3.0.0a11
2-
scikit-build >= >=0.11.1
3-
cmake >= 3.21.2
4-
ninja >= 1.10.2
1+
# Cython is the only hard requirement
2+
Cython>=3.0.0a11
3+
scikit-build>=0.11.1
4+
cmake>=3.21.2
5+
ninja>=1.10.2
6+
7+
cibuildwheel>=2.11.2 ; python_version < '4.0' and python_version >= '3.11' # Python 3.11+
8+
cibuildwheel>=2.11.2 ; python_version < '3.11' and python_version >= '3.10' # Python 3.10
9+
cibuildwheel>=2.11.2 ; python_version < '3.10' and python_version >= '3.9' # Python 3.9
10+
cibuildwheel>=2.11.2 ; python_version < '3.9' and python_version >= '3.8' # Python 3.8
11+
cibuildwheel>=2.11.2 ; python_version < '3.8' and python_version >= '3.7' # Python 3.7
12+
cibuildwheel>=2.8.1 ; python_version < '3.7' and python_version >= '3.6' # Python 3.6

setup.py

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
55
import warnings
66
import setuptools
77

8-
# pep 517 setup breaks this
9-
# so we disable pep 517 in pyproject.toml
10-
from comp import run_cythonize
11-
128

139
def _choose_build_method():
1410
DISABLE_C_EXTENSIONS = os.environ.get("DISABLE_C_EXTENSIONS", "").lower()
@@ -26,10 +22,13 @@ def _choose_build_method():
2622
import cmake # NOQA
2723
import ninja # NOQA
2824
except ImportError:
25+
# The main fallback disables c-extensions
2926
LINE_PROFILER_BUILD_METHOD = 'setuptools'
3027
else:
28+
# This should never be hit
3129
LINE_PROFILER_BUILD_METHOD = 'scikit-build'
3230
else:
31+
# Use plain cython by default
3332
LINE_PROFILER_BUILD_METHOD = 'cython'
3433

3534
return LINE_PROFILER_BUILD_METHOD
@@ -215,6 +214,24 @@ def gen_packages_items():
215214
elif LINE_PROFILER_BUILD_METHOD == 'cython':
216215
# no need to try importing cython because an import
217216
# was already attempted in _choose_build_method
217+
import multiprocessing
218+
from setuptools import Extension
219+
from Cython.Build import cythonize
220+
221+
def run_cythonize(force=False):
222+
return cythonize(
223+
Extension(
224+
name="line_profiler._line_profiler",
225+
sources=["line_profiler/_line_profiler.pyx", "line_profiler/timers.c", "line_profiler/unset_trace.c"],
226+
language="c++",
227+
define_macros=[("CYTHON_TRACE", (1 if os.getenv("DEV") == "true" else 0))],
228+
),
229+
compiler_directives={"language_level": 3, "infer_types": True, "linetrace": (True if os.getenv("DEV") == "true" else False)},
230+
include_path=["line_profiler/python25.pxd"],
231+
force=force,
232+
nthreads=multiprocessing.cpu_count(),
233+
)
234+
218235
setupkw.update(dict(ext_modules=run_cythonize()))
219236
setup = setuptools.setup
220237
else:

0 commit comments

Comments
 (0)