Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 4 additions & 19 deletions .github/workflows/runTestSinglePython.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,27 +23,12 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up Python
uses: actions/setup-python@v5
- uses: prefix-dev/setup-pixi@v0.8.3
with:
python-version: '3.12'
check-latest: true
- name: Install dependencies
cache: false
- name: Pixi run pytest
run: |
python -m pip install --upgrade pip
pip install flake8 pytest pytest-cov
pip install numpy cython
pip install setuptools
pip install pytest-mock
- name: Compile cython code
run: |
python setup.py build_ext --inplace --define CYTHON_TRACE
- name: Install avaframe
run: |
pip install .
- name: Test with pytest
run: |
pytest -ra --cov --cov-report=xml --cov-report lcov:cov.info --cov-config=.coveragerc
pixi run pytest -ra --cov --cov-report=xml --cov-report lcov:cov.info --cov-config=.coveragerc
- uses: qltysh/qlty-action/coverage@main
with:
coverage-token: ${{secrets.QLTY_COVERAGE_TOKEN}}
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Work

build

RELEASE-VERSION
RELEASE-VERSION.txt

*.egg*

Expand Down
6 changes: 4 additions & 2 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
include avaframe/RELEASE-VERSION
include avaframe/RELEASE-VERSION.txt
include avaframe/version.py
include avaframe/in3Utils/logging.conf
include avaframe/com1DFA/*.pyx
include avaframe/com1DFA/*.pxd
recursive-include avaframe *Cfg.ini
global-exclude local_*Cfg.ini
prune benchmarks
prune docs
prune avaframe/tests
prune avaframe/data
6 changes: 3 additions & 3 deletions avaframe/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# scheme that setuptools uses. If “git describe” returns an error
# (most likely because we're in an unpacked copy of a release tarball,
# rather than in a git working copy), then we fall back on reading the
# contents of the RELEASE-VERSION file.
# contents of the RELEASE-VERSION.txt file.
#
# To use this script, simply import it your setup.py file, and use the
# results of getVersion() as your package version:
Expand All @@ -27,7 +27,7 @@
# sdist tarballs; to do this, just create a MANIFEST.in file that
# contains the following line:
#
# include RELEASE-VERSION
# include RELEASE-VERSION.txt

from subprocess import check_output, run, CalledProcessError, DEVNULL, Popen, PIPE
import os
Expand Down Expand Up @@ -89,7 +89,7 @@ def releaseFile():
-------
path to RELEASE-VERSION file
"""
return os.path.join(getProjectPath(), 'RELEASE-VERSION')
return os.path.join(getProjectPath(), 'RELEASE-VERSION.txt')


def readReleaseVersion():
Expand Down
19 changes: 0 additions & 19 deletions codecov.yml

This file was deleted.

11 changes: 6 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ dependencies = [

# Setuptools
[tool.setuptools]
include-package-data = true
include-package-data = false

[tool.setuptools.packages.find]
exclude = ["docs"]
namespaces = false
exclude = ["docs*", "tests*"]

[tool.setuptools_scm]
version_scheme = "no-guess-dev"
local_scheme = "node-and-date"
version_file = "avaframe/RELEASE-VERSION.txt"

# Cibuildwhell
[tool.cibuildwheel]
Expand All @@ -84,8 +84,6 @@ channels = ["https://prefix.dev/conda-forge"]
platforms = ["linux-64", "win-64", "osx-64"]

[tool.pixi.dependencies]
pytest = "*"
pytest-mock ="*"
setuptools = "*"
setuptools-scm = "*"

Expand All @@ -95,6 +93,9 @@ avaframe = { path = "./", editable = true }

[tool.pixi.feature.dev.dependencies]
pixi-pycharm = "*"
pytest = "*"
pytest-cov = "*"
pytest-mock ="*"

#Feature doc
[tool.pixi.feature.doc.dependencies]
Expand Down
16 changes: 8 additions & 8 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@
setup(
options=setup_options,
ext_modules=ext_modules,
install_requires=[
'numpy',
'scipy',
'cython',
'matplotlib',
'pandas'
],
python_requires='>=3.8',
# install_requires=[
# 'numpy',
# 'scipy',
# 'cython',
# 'matplotlib',
# 'pandas'
# ],
# python_requires='>=3.8',
)
Loading