Skip to content

Commit a58d882

Browse files
committed
Update to release v3.0.0a1
2 parents 6e0e19b + b675b6e commit a58d882

315 files changed

Lines changed: 12127 additions & 16601 deletions

File tree

Some content is hidden

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

.coveragerc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ omit =
44
*/site-packages/nose/*
55
*/tests/*
66
*.pyi
7+
PyPWA/libs/logger.py
78

89
exclude_lines =
910
raise NotImplementedError

.gitignore

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Byte-compiled / optimized / DLL files
22
__pycache__/
33
*.py[cod]
4+
.pytest_cache/
45

56
# C extensions
67
*.so
@@ -74,14 +75,6 @@ docs/build/
7475
# PyBuilder
7576
target/
7677

77-
# Virtualenv
78-
virt/
79-
virt3/
80-
venv/
81-
venv2/
82-
83-
# PyCharm
84-
.idea/
85-
8678
# MyPy
8779
/.mypy_cache/
80+

.travis.yml

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,35 @@
11
sudo: false
2+
dist: xenial
23
language: python
34
cache: pip
45
python:
5-
- "2.7"
6-
- "3.4"
7-
- "3.5"
8-
- "3.6"
9-
- "3.6-dev"
6+
- "3.7"
7+
- "3.8-dev"
108
matrix:
119
allow_failures:
12-
- python: "3.6-dev"
10+
- python: "3.8-dev"
1311
addons:
1412
apt:
1513
packages:
1614
- "build-essential"
1715
- "gfortran"
1816
- "libatlas-base-dev"
17+
- "libopenblas-dev"
18+
- "liblapack-dev"
19+
- "python-dev"
20+
- "cython"
1921
before_install:
20-
- python --version
21-
- uname -a
22-
- ls -a
2322
- "pip install --upgrade pip setuptools wheel"
2423
- "pip install --upgrade numpy scipy"
2524
- "pip install --upgrade iminuit nestle ruamel.yaml tabulate appdirs"
2625
- "pip install --upgrade fuzzywuzzy python-Levenshtein"
27-
- "pip install coveralls --upgrade"
28-
- "pip install coverage --upgrade"
29-
- "pip install pytest --upgrade"
30-
- "pip install pytest-runner --upgrade"
31-
- "pip install pytest-cov --upgrade"
32-
- "pip install pytest-logging --upgrade"
26+
- "pip install --upgrade coveralls coverage"
27+
- "pip install --upgrade pytest pytest-runner pytest-cov"
3328
install:
34-
- "pip install -e ."
35-
script: "py.test --cov=PyPWA tests/ -vvvv"
29+
- "pip install --upgrade -e ."
30+
script: "pytest --cov=PyPWA tests --cov-report="
3631
after_success:
37-
- ls -a
3832
- coveralls
39-
- head .coverage
4033
notifications:
4134
emails:
4235
on_success: change

CHANGELOG.md

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,39 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
55
and this project adheres to [Semantic Versioning](http://semver.org/)
66

77

8+
## [3.0.0a1] - 2019-6-17
9+
### Added
10+
- Added numpy reader and writer.
11+
- Adds a helper script to clean the project directory of caches.
12+
- Adds initial documentation for PyPWA.
13+
- Added support for 3 Vectors, 4 Vectors, and Particles
14+
- Added ParticlePool to aid in working with multiple Particles
15+
- Added a binning utility that supports multiple binning variables and
16+
dimensions
17+
- Added PyTables support, so that large datasets can be easily managed
18+
### Changed
19+
- All program names have been lowercased
20+
- Configuration package has been compressed into a single module
21+
- PySimulate now is a library that has no UI, and has a UI portion
22+
that exclusively works with interfacing
23+
- Fuzzywuzzy is now optional
24+
- Process package is now a single module. Interface no longer uses IS_DUPLEX
25+
- Bulk of program functionality moved to libs, progs being just for UI
26+
- Builtin Plugins moved to libs, old plugin's plugins have still reside
27+
in plugins, but under a package with the appropriate name. I.E. data
28+
plugins are in plugins/data.
29+
- All file related libs have been moved to libs/file
30+
- Combined optimizers with fit library
31+
- GAMP was updated to use Particles and ParticlePool
32+
- Files with extra newline should parse correctly now
33+
- CSV and TSV files will be lf instead of crlf on linux systems now
34+
### Removed
35+
- Nestle Minimization. There is currently no clear way to have Minuit and
36+
Nestle to operate with each other nicely. Implementation for multiple
37+
optimizers will remain, as well as new associated issues created.
38+
- Removed support for all version of Python before 3.7
39+
40+
841
## [2.2.1] - 2017-10-16
942
### Fixed
1043
- Setup would pull in unstable Yaml parser
@@ -26,7 +59,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/)
2659
on the interfaces purpose.
2760
- PyFit no longer assumes bins are named 'BinN' you must specify Bin names
2861
in 'internal data'.
29-
- Multipler effect for the Miminzers has been moved to the individual
62+
- Multiplier effect for the Minimizers has been moved to the individual
3063
likelihoods.
3164
- PyMask defaults to AND operations instead of or now.
3265
### Fixed
@@ -77,7 +110,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/)
77110
- Packaging
78111

79112

80-
[Unreleased]: https://github.com/JeffersonLab/PyPWA/compare/v2.2.0...development
113+
[Unreleased]: https://github.com/JeffersonLab/PyPWA/compare/v3.0.0a1...development
114+
[3.0.0a1]: https://github.com/JeffersonLab/PyPWA/compare/v2.2.1...v3.0.0a1
81115
[2.2.1]: https://github.com/JeffersonLab/PyPWA/compare/v2.2.0...v2.2.1
82116
[2.2.0]: https://github.com/JeffersonLab/PyPWA/compare/v2.1.0...v2.2.0
83117
[2.1.0]: https://github.com/JeffersonLab/PyPWA/compare/v2.0.0...v2.1.0

CONTRIBUTORS.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
# Contributors to PyPWA (in Chronological Order)
22

3-
## PyPWA Staff:
3+
### Current PyPWA Staff:
44
- Carlos Salgado <https://github.com/cwsalgado>
55
- Will Phelps <https://github.com/wphelps>
6+
- Mark Jones <markjonestx@live.com> <https://github.com/Markjonestx>
7+
8+
### Previous PyPWA Staff:
69
- Brandon DeMello <https://github.com/bdell>
710
- Stephanie Bramlett <https://github.com/skbramlett>
811
- Josh Pond <https://github.com/JTPond>
9-
- Mark Jones <markjonestx@live.com> <https://github.com/Markjonestx>
1012
- LaRay Hare <https://github.com/lmhare>
1113
- Christopher Banks <https://github.com/cjbanks>
1214

13-
High School Interns:
14-
15+
### High School Interns:
1516
- Ryan Wright <https://github.com/painballking>
1617
- Ran Amplitude benchmarks on the XeonPhi

PyPWA/__init__.py

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,18 @@
3838
- PyIntensities - Just the calculation half of PySimulate.
3939
4040
- PyRejection - Just the rejection-method half of PySimulate.
41-
41+
4242
For information about how to use each of the programs, look in the docs folder
4343
included with the source code, or check the user docs at ReadTheDocs.io.
4444
4545
Developer Docs
4646
==============
4747
4848
To attempt to achieve a flexible fitter that could be quickly adapted to
49-
changing needs, we actually built the entire package around a generalized
50-
plugin loader. The "main" objects ore defined as plugins, along with each
51-
task that needed to be solved. This means that fitting, data loading,
52-
the processing module, simulation, optimizers, etc are all defined as
49+
changing needs, we actually built the entire package around a generalized
50+
plugin loader. The "main" objects ore defined as plugins, along with each
51+
task that needed to be solved. This means that fitting, data loading,
52+
the processing module, simulation, optimizers, etc are all defined as
5353
plugins internally.
5454
5555
Package purposes
@@ -77,18 +77,14 @@
7777
respectively.
7878
"""
7979

80+
8081
__author__ = "PyPWA Team and Contributors"
8182
__credits__ = ["Mark Jones"]
82-
__version__ = "2.2.0"
83+
__version__ = "3.0.0.dev"
8384

8485

85-
EMAIL = "pypwa@jlab.org"
8686
LICENSE = "GPLv3"
87-
STATUS = "stable"
87+
STATUS = "development"
8888
MAINTAINER = "Mark Jones"
8989
AUTHOR = __author__
9090
VERSION = __version__
91-
92-
93-
from PyPWA.builtin_plugins.data.iterator import Iterator
94-
from PyPWA.builtin_plugins.data.memory import Memory

PyPWA/builtin_plugins/data/__init__.py

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

0 commit comments

Comments
 (0)