Skip to content

Commit 7f8bc92

Browse files
committed
authors, main workfow .gitignore
1 parent a5b25b3 commit 7f8bc92

File tree

3 files changed

+41
-41
lines changed

3 files changed

+41
-41
lines changed

.github/workflows/main.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches:
66
- main
7+
- CI
78
pull_request:
89
workflow_dispatch:
910

@@ -19,9 +20,8 @@ jobs:
1920
uses: actions/checkout@v3
2021
with:
2122
repository: diffpy/diffpy.pdfmorph
22-
# for bookkeeping have diffpy.pdfmorph at the same level as everything else in the
23-
# directory tree
2423
path: .
24+
fetch-depth: 0 # avoid shallow clone with no tags
2525

2626
- name: initialize miniconda
2727
# this uses a marketplace action that sets up miniconda in a way that makes
@@ -36,7 +36,7 @@ jobs:
3636
python-version: 3
3737
auto-activate-base: false
3838

39-
- name: install pdfmorph requirements
39+
- name: install diffpy.pdfmorph requirements
4040
shell: bash -l {0}
4141
run: |
4242
conda config --set always_yes yes --set changeps1 no
@@ -45,12 +45,10 @@ jobs:
4545
conda install --file requirements/run.txt
4646
conda install --file requirements/test.txt
4747
pip install .
48-
49-
- name: Validate pdfmorph
48+
- name: Validate diffpy.pdfmorph
5049
shell: bash -l {0}
5150
run: |
5251
conda activate test
53-
pdfmorph --help # Check run on command line
54-
python -m coverage run run_tests.py # use `python -m` to search for modules within env
52+
coverage run -m pytest -vv -s
5553
coverage report -m
5654
codecov

.gitignore

Lines changed: 32 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,14 @@ lib64/
2020
parts/
2121
sdist/
2222
var/
23+
venv/
2324
*.egg-info/
2425
.installed.cfg
2526
*.egg
27+
bin/
28+
temp/
29+
tags/
30+
errors.err
2631

2732
# PyInstaller
2833
# Usually these files are written by a python script from a template
@@ -33,6 +38,7 @@ var/
3338
# Installer logs
3439
pip-log.txt
3540
pip-delete-this-directory.txt
41+
MANIFEST
3642

3743
# Unit test / coverage reports
3844
htmlcov/
@@ -49,48 +55,45 @@ coverage.xml
4955
*.mo
5056
*.pot
5157

58+
# Mr Developer
59+
.mr.developer.cfg
60+
.project
61+
.pydevproject
62+
5263
# Django stuff:
5364
*.log
54-
local_settings.py
55-
56-
# Flask stuff:
57-
instance/
58-
.webassets-cache
59-
60-
# Scrapy stuff:
61-
.scrapy
6265

6366
# Sphinx documentation
64-
docs/_build/
67+
docs/build/
68+
docs/source/generated/
69+
70+
# pytest
71+
.pytest_cache/
6572

6673
# PyBuilder
6774
target/
6875

69-
# IPython Notebook
70-
.ipynb_checkpoints
71-
72-
# pyenv
73-
.python-version
76+
# Editor files
77+
# mac
78+
.DS_Store
79+
*~
7480

75-
# celery beat schedule file
76-
celerybeat-schedule
81+
# vim
82+
*.swp
83+
*.swo
7784

78-
# dotenv
79-
.env
85+
# pycharm
86+
.idea/
8087

81-
# virtualenv
82-
venv/
83-
ENV/
88+
# VSCode
89+
.vscode/
8490

85-
# Spyder project settings
86-
.spyderproject
91+
# Ipython Notebook
92+
.ipynb_checkpoints
8793

88-
# Rope project settings
89-
.ropeproject
94+
# version information
95+
setup.cfg
96+
/src/diffpy/*/version.cfg
9097

91-
# pycharm
92-
.idea/
93-
# Mac
94-
.DS_Store
9598
# Rever
9699
rever/

AUTHORS.rst

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
Authors
2-
====================
2+
=======
33

4-
Christopher L. Farrow, Christopher James Wright, Pavol Juhas,
5-
Chia-Hao (Timothy) Liu, Timur Davis, S. Matthew Román, Simon J.L.
6-
Billinge
4+
Billinge Group and community contibutors.
75

86
Contributors
97
------------
10-
For a list of contributors, visit
8+
9+
For a list of contributors, visit
1110
https://github.com/diffpy/diffpy.pdfmorph/graphs/contributors

0 commit comments

Comments
 (0)