Skip to content

Commit

Permalink
verifies locally
Browse files Browse the repository at this point in the history
  • Loading branch information
ktactac-ornl committed Jun 3, 2024
1 parent 67bb171 commit 0e696ed
Show file tree
Hide file tree
Showing 15 changed files with 21 additions and 534 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
cd conda.recipe
echo "versioningit $(versioningit ../)"
# build the package
VERSION=$(versioningit ../) conda mambabuild --channel conda-forge --output-folder . .
VERSION=$(versioningit ../) conda mambabuild --output-folder . .
conda verify noarch/pystog*.tar.bz2
- name: upload conda package to anaconda
shell: bash -l {0}
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
workflow_dispatch:
pull_request:
push:
branches: [next, qa, main]
branches: [master]
tags: ['v*']

jobs:
Expand All @@ -29,7 +29,7 @@ jobs:
- name: run tests
run: |
echo "running tests"
python -m pytest --cov=pystog --cov-report=xml --cov-report=term-missing tests/
python -m pytest --cov=src --cov-report=xml --cov-report=term-missing tests/
- name: upload coverage to codecov
uses: codecov/codecov-action@v4
with:
Expand All @@ -41,6 +41,5 @@ jobs:
echo "versioningit $(versioningit ../)"
# conda channels could have been defined in the conda-incubator, but you can copy/paste the lines
# below to build the conda package in your local machine
CHANNELS="--channel mantid/label/main --channel conda-forge"
VERSION=$(versioningit ../) conda mambabuild $CHANNELS --output-folder . .
VERSION=$(versioningit ../) conda mambabuild --output-folder . .
conda verify noarch/pystog*.tar.bz2
6 changes: 3 additions & 3 deletions conda.recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ build:
number: {{ git_describe_number }}
string: py{{py}}
script: {{ PYTHON }} -m pip install . --no-deps --ignore-installed -vvv
entry_points:
- pystog_cli = pystog.cli:pystog_cli
#entry_points:
# - pystog_cli = pystog.cli:pystog_cli

requirements:
host:
Expand All @@ -47,7 +47,7 @@ test:
about:
home: {{ url }}
license: {{ license }}
license_family: GPL3
license_family: GPL
license_file:
summary: "Transforms reciprocal and real space total scattering functions"

Expand Down
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ requires-python = ">=3.6"
dependencies = [
# list all runtime dependencies here
]
license = { text = "GPL-3.0" }
license = { text = "GPL3.0" }

[project.urls]
homepage = "https://github.com/neutrons/pystog/" # if no homepage, use repo url
Expand Down Expand Up @@ -36,10 +36,10 @@ dirty = "{version}+d{build_date:%Y%m%d}"
distance-dirty = "{next_version}.dev{distance}+d{build_date:%Y%m%d%H%M}"

[tool.versioningit.write]
file = "pystog/_version.py"
file = "src/pystog/_version.py"

[tool.setuptools.packages.find]
where = ["pystog"]
where = ["src"]
exclude = ["fortran"]

[tool.setuptools.package-data]
Expand Down
Loading

0 comments on commit 0e696ed

Please sign in to comment.