Skip to content

Commit 5798f0c

Browse files
authored
Merge pull request #89 from bobleesj/cookie-py312
Support Python 3.12 with CI, move tests to top level
2 parents f1162a6 + 2fafe83 commit 5798f0c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+94
-191
lines changed

.github/workflows/tests-on-pr.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: Tests on PR
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
8+
workflow_dispatch:
9+
10+
jobs:
11+
validate:
12+
uses: Billingegroup/release-scripts/.github/workflows/_tests-on-pr.yml@v0
13+
with:
14+
project: diffpy.srfit
15+
c_extension: false
16+
headless: false
File renamed without changes.
File renamed without changes.

environment.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
name: diffpy.srfit
2+
channels:
3+
- conda-forge
4+
dependencies:
5+
- python=3
6+
- pip

pyproject.toml

Lines changed: 44 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,58 @@
1+
[build-system]
2+
requires = ["setuptools>=62.0", "setuptools-git-versioning>=2.0"]
3+
build-backend = "setuptools.build_meta"
4+
5+
[project]
6+
name = "diffpy.srfit"
7+
dynamic=['version', 'dependencies']
8+
classifiers = [
9+
'Development Status :: 5 - Production/Stable',
10+
'Environment :: Console',
11+
'Intended Audience :: Developers',
12+
'Intended Audience :: Science/Research',
13+
'Operating System :: MacOS :: MacOS X',
14+
'Operating System :: Microsoft :: Windows',
15+
'Operating System :: POSIX',
16+
'Operating System :: Unix',
17+
'Topic :: Scientific/Engineering :: Physics',
18+
'Topic :: Scientific/Engineering :: Chemistry',
19+
]
20+
21+
22+
[tool.setuptools-git-versioning]
23+
enabled = true
24+
template = "{tag}"
25+
dev_template = "{tag}"
26+
dirty_template = "{tag}"
27+
28+
[tool.setuptools.packages.find]
29+
where = ["src"] # list of folders that contain the packages (["."] by default)
30+
include = ["*"] # package names should match these glob patterns (["*"] by default)
31+
exclude = [] # exclude packages matching these glob patterns (empty by default)
32+
namespaces = false # to disable scanning PEP 420 namespaces (true by default)
33+
34+
[tool.setuptools.dynamic]
35+
dependencies = {file = ["requirements/run.txt"]}
36+
137
[tool.black]
238
line-length = 115
339
include = '\.pyi?$'
440
exclude = '''
541
/(
6-
\.git\
42+
\.git
43+
| \.hg
744
| \.mypy_cache
845
| \.tox
946
| \.venv
10-
| _build/
47+
| \.rst
48+
| \.txt
49+
| _build
1150
| buck-out
1251
| build
1352
| dist
53+
54+
# The following are specific to Black, you probably don't want those.
1455
| blib2to3
15-
| tests/data/
16-
| hooks/post_gen_project.py$
17-
| .*\.py$
18-
| .*\.toml$
56+
| tests/data
1957
)/
2058
'''

requirements/pip.txt

Whitespace-only changes.

requirements/run.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
scipy
2+
numpy
3+
matplotlib

requirements/test.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
flake8
2+
pytest
3+
codecov
4+
coverage
5+
pytest-cov
6+
pytest-env

setup.py renamed to setup.txt

File renamed without changes.

src/diffpy/srfit/.DS_Store

6 KB
Binary file not shown.

0 commit comments

Comments
 (0)