Skip to content

Commit 325883d

Browse files
committed
Final changes
1 parent 3dd92a3 commit 325883d

File tree

4 files changed

+16
-57
lines changed

4 files changed

+16
-57
lines changed

.coveragerc

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

ci/azure_template_posix.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
PANDAS: 1.3.0
2424
STATSMODELS: 0.13.1
2525
XARRAY: 0.21.0
26-
FORMULAIC: 1.0.2
26+
FORMULAIC: 1.2.1
2727
test.wheel: true
2828
python310_mid_sdist:
2929
python.version: '3.10'
@@ -33,7 +33,7 @@ jobs:
3333
STATSMODELS: 0.13.1
3434
XARRAY: 2022.6.0
3535
XXHASH: true
36-
FORMULAIC: 1.0.2
36+
FORMULAIC: 1.2.1
3737
test.sdist: true
3838
python310_recent_wheel:
3939
python.version: '3.10'
@@ -42,16 +42,15 @@ jobs:
4242
PANDAS: 2.0.0
4343
STATSMODELS: 0.14.0
4444
XARRAY: 2023.4.0
45-
FORMULAIC: 1.1.0
45+
FORMULAIC: 1.2.1
4646
test.wheel: true
4747
python310_latest:
4848
python.version: '3.10'
49-
FORMULAIC: 1.2.0
49+
FORMULAIC: 1.2.1
5050
XXHASH: true
5151
PYARROW: true
5252
python310_no_cython:
5353
python.version: '3.10'
54-
BUILD_FLAGS: '-Csetup-args=-Dno-binary=true'
5554
python311_latest:
5655
python.version: '3.11'
5756
XXHASH: true
@@ -60,6 +59,11 @@ jobs:
6059
python.version: '3.12'
6160
XXHASH: true
6261
PYARROW: true
62+
python312_latest_no_binary:
63+
python.version: '3.12'
64+
XXHASH: true
65+
PYARROW: true
66+
BUILD_FLAGS: '-Csetup-args=-Dno-binary=true'
6367
python313_latest:
6468
python.version: '3.13'
6569
XXHASH: true
@@ -69,8 +73,8 @@ jobs:
6973
python.version: '3.12'
7074
XXHASH: true
7175
LM_TEST_COPY_ON_WRITE: 1
72-
python312_pre:
73-
python.version: '3.12'
76+
python313_pre:
77+
python.version: '3.13'
7478
pip.pre: true
7579
maxParallel: 10
7680

@@ -135,19 +139,15 @@ jobs:
135139
136140
- script: |
137141
echo "Testing editable install"
138-
if [[ ${COVERAGE} == "true" ]]; then
139-
export COVERAGE_OPTS="--cov=linearmodels --cov-report xml:coverage.xml --cov-report term"
140-
fi
142+
export COVERAGE_OPTS="--cov=linearmodels --cov-report xml:coverage.xml --cov-report term"
141143
echo pytest -m "${PYTEST_PATTERN}" --junitxml=junit/test-results.xml -n auto --durations=25 ${COVERAGE_OPTS} linearmodels/tests
142144
pytest -m "${PYTEST_PATTERN}" --junitxml=junit/test-results.xml -n auto --durations=25 ${COVERAGE_OPTS} linearmodels/tests
143145
displayName: 'Run tests (editable)'
144146
condition: and(and(ne(variables['test.wheel'], 'true'), ne(variables['test.sdist'], 'true')), ne(variables['pip.pre'], 'true'))
145147
146148
- script: |
147149
echo "Testing pip-pre"
148-
if [[ ${COVERAGE} == "true" ]]; then
149-
export COVERAGE_OPTS="--cov-config .coveragerc --cov=linearmodels --cov-report xml:coverage.xml --cov-report term"
150-
fi
150+
export COVERAGE_OPTS="--cov=linearmodels --cov-report xml:coverage.xml --cov-report term"
151151
echo pytest -m "${PYTEST_PATTERN}" --junitxml=junit/test-results.xml -n auto --durations=25 ${COVERAGE_OPTS} linearmodels/tests
152152
pytest -m "${PYTEST_PATTERN}" --junitxml=junit/test-results.xml -n auto --durations=25 ${COVERAGE_OPTS} linearmodels/tests
153153
displayName: 'Run tests (pip pre)'
@@ -163,11 +163,11 @@ jobs:
163163
- task: PublishCodeCoverageResults@2
164164
inputs:
165165
summaryFileLocation: '$(System.DefaultWorkingDirectory)/**/coverage.xml'
166-
condition: and(eq(variables['coverage'], 'true'), ne(variables['test.install'], 'true'))
166+
condition: and(ne(variables['test.sdist'], 'true'), ne(variables['test.wheel'], 'true'))
167167

168168
- script: |
169169
curl -Os https://uploader.codecov.io/latest/linux/codecov
170170
chmod +x codecov
171171
./codecov -f coverage.xml -F adder -F subtractor
172172
displayName: 'Codecov upload'
173-
condition: and(eq(variables['coverage'], 'true'), ne(variables['test.install'], 'true'))
173+
condition: and(ne(variables['test.sdist'], 'true'), ne(variables['test.wheel'], 'true'))

linearmodels/meson.build

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ inc_np = include_directories(incdir_numpy, is_system: true)
2929
# Copy the main __init__.py to the build dir.
3030
# Some submodules (linalg, special, optimize) add pxd files to this.
3131
# Needed to trick Cython, it won't do a relative import outside a package
32-
_cython_tree = [fs.copyfile('__init__.py')]
3332
cython_args = [
3433
'-Xcpow=True',
3534
'-Xboundscheck=False',

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ include_trailing_comma=true
311311
use_parentheses=true
312312

313313
[tool.coverage.run]
314-
source = ["linearmodels"]
314+
source = [ "linearmodels" ]
315315
branch = true
316316
plugins = ["Cython.Coverage"]
317317
omit = [

0 commit comments

Comments
 (0)