Skip to content

Commit 9356c96

Browse files
lmetherlmether
authored
Merge pull request #147 from PyCOMPLETE/release/v1.15.0
Release/v1.15.0
2 parents c91af92 + 838e6ab commit 9356c96

File tree

132 files changed

+481
-16508
lines changed

Some content is hidden

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

132 files changed

+481
-16508
lines changed

‎.github/workflows/github-ci.yaml‎

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

‎.github/workflows/manual-ci.yaml‎

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

‎.github/workflows/python-package.yml‎

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

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ scripts/
1616
.DS_Store
1717
*.__afs*
1818
*.egg-info
19+
/.eggs/

‎.travis.yml‎

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

‎MANIFEST.in‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
recursive-include PyHEADTAIL *.pxd *.pyx *.c *.f90 *.cu
2-
recursive-include PyHEADTAIL/testing *.py *.dat
32
include README.rst

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ NVCC_TEST := $(notdir $(NVCC_RESULT))
77
all: PyHEADTAIL PyHEADTAILGPU errfff
88

99
PyHEADTAIL:
10-
python setup.py build_ext --inplace
10+
python3 setup.py build_ext --inplace
1111

1212
PyHEADTAILGPU:
1313
ifeq ($(NVCC_TEST),nvcc)
@@ -17,7 +17,7 @@ else
1717
endif
1818

1919
errfff:
20-
f2py -c PyHEADTAIL/general/errfff.f90 -m errfff
20+
f2py3 -c PyHEADTAIL/general/errfff.f90 -m errfff
2121
mv errfff*.so PyHEADTAIL/general/
2222

2323
clean:

‎PULL_REQUEST_TEMPLATE.md‎

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

‎PyHEADTAIL/__init__.py‎

Lines changed: 20 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,22 @@
1-
try:
2-
DYNAMIC_VERSIONING = True
3-
import os, subprocess
4-
worktree = os.path.dirname(
5-
os.path.dirname(os.path.abspath(__file__)))
6-
gitdir = worktree + '/.git/'
7-
with open(os.devnull, 'w') as devnull:
8-
__version__ = subprocess.check_output(
9-
'git --git-dir=' + gitdir + ' --work-tree=' +
10-
worktree + ' describe --long --dirty --abbrev=10 --tags',
11-
shell=True, stderr=devnull)
12-
__version__ = __version__.decode('utf-8').rstrip() # remove trailing \n
13-
__version__ = __version__[1:] # remove leading v
14-
# remove commit hash to conform to PEP440:
15-
split_ = __version__.split('-')
16-
__version__ = split_[0]
17-
if split_[1] != '0':
18-
__version__ += '.' + split_[1]
19-
dirty = 'dirty' in split_[-1]
20-
except:
21-
DYNAMIC_VERSIONING = False
22-
from ._version import __version__
23-
dirty = False
1+
from . import aperture
2+
from . import cobra_functions
3+
from . import feedback
4+
from . import field_maps
5+
from . import general
6+
from . import gpu
7+
from . import impedances
8+
from . import machines
9+
from . import monitors
10+
from . import multipoles
11+
from . import particles
12+
from . import radiation
13+
from . import rfq
14+
from . import spacecharge
15+
from . import trackers
2416

25-
print(('PyHEADTAIL v' + __version__))
26-
if dirty:
27-
print ('(dirty git work tree)')
28-
print ('\n')
17+
from ._version import __version__
18+
19+
Particles = particles.Particles
20+
21+
print('PyHEADTAIL v' + __version__)
2922

30-
# print ' '
31-
# print ' ;Cfttttt11111111tttt1f0f. '
32-
# print ' ,GttttfG0GGG00000GGG0G0G0G0G0G0Ct1t1fG: '
33-
# print ' ,GtttLG000GGGGGGGGGGG00GGGGGGGGGGGGGG0GGG0GCtttLt '
34-
# print ' .CtttC0G00GGGGGGGGGGG00t1t1GGGGGGGGGGGGGGGGGG0GG0G00Gtttt '
35-
# print ' G1tf000GGGGGGGGGG000811tGG0GL0GGGGGGGGGGGGGGGGGGGGGGGGGGGGG11C '
36-
# print ' GtttGG0G00GGGGGGGGG08t1GGG0;;0G000GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGtt: '
37-
# print ' 01tGG00GGGGGGGGGGGG0tt000ft::::GGG00GGGGGGGGGGGGGGGGGGG0GGG0G0000000GftG '
38-
# print ' L1tLf. 8ttGGGGGGGGGGGGGG00GtGG8fft:::::;0GG@0GGGGGGGGGGGGG00G088888888888GttfLLLt1C '
39-
# print ' CtG0G0GG8888t.G1tGGGGGGGGGGGGGGG0fGG0ffff;:::::::0G08GGGGGGGGGGGG888888888888f '
40-
# print ' .tt0GGGGG0888Ctf0GGGGGGGGGGGG0G0000GGGG0Gt;:;:::;0GG88GGGGG8808888888888C '
41-
# print ' C1GGGGGG0G01t00GGGGGGGGGGGGG00000000GGGGGGGG;::;GGG80GGGGGGGG0Lt1t@@i '
42-
# print ' 1tGGGGG0811G00GGGGGGGGGGGGGGGG0880G0GGGGGG0G0;L0G08GGGGGGGGGGG0GGG1ttf '
43-
# print ' t1t0GG08t1G0GGGGGGGGGGGGG0GtLGGGG0GLtGGGGGGGGG8G08GGGGGGGGGGGGGGGGG00tttf '
44-
# print ' 0tCGG8tt00GGGGGGGGG0G0CtG0GG0GGG000GGt00GGGG000GGGGGGGGGGGGGGGGGGGGGG0G1tG '
45-
# print ' 0G0G81G0GGGGGGGGGG0Gf00GG8888@8@80GGG0CGGG0GGGGGGGGGGGGGGGGGGGGGGGGGG000ttL '
46-
# print ' C11GG080GGGGGGGG00t0GG08@111: .i1t80GG08GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGt1C '
47-
# print ' f0@tGGGGGGGGGGG00C0GG88i1 1GG0G0GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG0GGttC '
48-
# print ' G88ffG0GGGGGG0G0GGG0811. .0GG08GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG0Gt1L '
49-
# print ' C .C .0G1800GGGGGG0G00f0811 .0G00GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG0G11i '
50-
# print ' L 1 Lt 11GGGGGGG000ft81: .8; 0G0GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG0GG001t0 '
51-
# print ' L: .C 1 f t 8CG00GGGG0G181, 0G00 00G0GG0GGGGGGGGGGGGGGGGGGGGGGGG0GGGGGGGGGGGGtt8 '
52-
# print ' f. . .;iC .. C .tGLG0GGGGt01. 0, Gi 0GGGGGGGGGGGGGGGGGGG0GGGGGGGGGGGGGGGGGGGGGGGGtt8 '
53-
# print ' CL0t .G1111 : G 1 08t8L0000t11: 00@8L t0GGGGGGGGGGGGGGGGGGG80GGGGGGGGGGGGGGGGGGGGGGGG11L '
54-
# print ' 1 C1 i f , :,0C10G0Ltf: :C8@1 :00GGGGGGGGGGGGGGGGGGGGG8888880000GGGGGGGGGGGGGGCtt. '
55-
# print ' ,1G:C111. .1 i i i 0@80ttt10i G111 fGGG0GGGGGGGGGGGGGGGGGGGGG8888888888GGG0GGGGGGGGGGtt0 '
56-
# print ' ; tL1 01 ; Gf C 00. LG1 f f;;:::;;:8GGGGGGGGGGGGGGG0GGGt888888888880GGGGGGGG00Gtt. '
57-
# print ' i1i C1 i111 . C8@G i0,G;::;C1 .t;:;:;::::::0GGGG00GGGGGGGGGGG0G11 .G8@8888880GGGGGGGGGL1G '
58-
# print ' L111tt1111. 1; 1111. . @888@@888:;:;;:;;;0. :t::::;: :::::8GG88GGGGG0GGGGGGGGGC1, 8888@8800GGGGGG1t '
59-
# print ' 8 C1 f L11i ;. 1. ;.:;:::::::::::::::::::::;; ;;:::10G880GGGGGGGGGGGGGG0GL1 ,88888G0GGG0f1. '
60-
# print ' G .i, .1 G ,1110f L.::::::::::::::::::::;. i.L;;:;LG88888G0GGGGGGGGGGGGGG0tf ,88880GGGGt; '
61-
# print ' t111111; :11 f11L G .1.::::::::::::;CC;:;:;:::;;C88888888880GGGGGGGGGGGGG0G1G 0@8000G1t '
62-
# print ' L1Cf011. ;11 .11G t1.L ,L,.::::::;:::::;:::C@888888888888888G000GGGGGGGGGGt1 f880GtL '
63-
# print ' .G111111111. .1t. 111.. .:LG8888@88088@0tfL@G t88888888880GGGGGGGGG0GCti CC0tL '
64-
# print ' ;L111111110. .1C i :..::;ft888888888ffffffftt8. 08888880GGGGGGGGGGGtG tti '
65-
# print ' G11i,,,,. 0 :L..;:::::;ffC88888888fffi::::::..C; C88888GGG0GGGG0GtC f. '
66-
# print ' .Gf11111. :Cff.C ,tftL.,;:::::::::;f888888888881:;:::::::..i. 888800GGGGGG01L '
67-
# print ' i1111111111ffft;:.....::ft..:::::::::::::0G000GGGG8888880f;;;::::.. 88880GGGGGGtf '
68-
# print ' .. iffff;:::::::;ttC.::::::::::::::0GGGG0GC888888800t G::::;.G @88GGGGGGtf '
69-
# print ' . G::::::;1: L.;:;:::::::::::GG0G0Gf888888 Gi10::::;:. .;@8GGGGGtC '
70-
# print ' ,.:::::::::::::;0GG1 L888 1L fG:;:::::. 880GGG1C '
71-
# print ' .,:::::::::::;80i...... 1G tf;:::.; 880001. '
72-
# print ' :.:::::::::::t. . GftftC,G G0Gtt '
73-
# print ' :.:;::::::;i , Ct11G LC1i '
74-
# print ' 1:::::::1001 C . tf '
75-
# print ' '

‎PyHEADTAIL/_version.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '1.14.1'
1+
__version__ = '1.14.2'

0 commit comments

Comments
 (0)