Commit 5afe0670 authored by Zolnierczuk, Piotr's avatar Zolnierczuk, Piotr
Browse files

fixing setup.py

parent 91c162f4
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -7,5 +7,6 @@
*.mac*
*.swp
work
doc/build
.ipynb_checkpoints
.DS_Store
+0 −5
Original line number Diff line number Diff line
@@ -19,10 +19,6 @@ LINT=$(PROJNAME)
all: build

build: build-ui build-docs
	@$(PYTHON) setup.py  build

build-dist: build
	@$(PYTHON) setup.py  bdist

install: install-global

@@ -44,7 +40,6 @@ pylint:
	@PYTHONPATH=. pylint --rcfile=.pylint.rc $(LINT)

clean: clean-docs
	@-$(PYTHON) setup.py clean

distclean: clean
	@rm -rf build dist MANIFEST cachedir *.egg-info $(PROJECT).tar.gz test.log
+2 −1
Original line number Diff line number Diff line
@@ -34,7 +34,8 @@ extensions = [
    'sphinx.ext.viewcode',
]

source_suffix = '.rst'

source_suffix = {'.rst': 'restructuredtext'}
master_doc = 'index'

exclude_patterns = []

doc/source/conf.py.orig

deleted100644 → 0
+0 −114
Original line number Diff line number Diff line
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
# For the full list of built-in configuration values, see the documentation:
# https://www.sphinx-doc.org/en/master/usage/configuration.html

#
# PySEN documentation build configuration file, created by
# sphinx-quickstart on Sat Sep 17 10:33:49 2016.
#
import sys
import os

# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
sys.path.insert(0, os.path.abspath('../..'))
import pysen

# General information about the project.
project = 'PySEN'
copyright = '2013-2025, Piotr Zolnierczuk, Juelich Center for Neutron Science & Oak Ridge National Laboratory'
author = 'Piotr Zolnierczuk'
version = pysen.version()
release = pysen.version(full=True)
language = 'en'

templates_path = ['_templates']

extensions = [
    'sphinx.ext.autodoc',
    'sphinx.ext.doctest',
    'sphinx.ext.todo',
    'sphinx.ext.mathjax',
    'sphinx.ext.viewcode',
]

source_suffix = '.rst'
master_doc = 'index'

<<<<<<< HEAD
# General information about the project.
project = 'PySEN'
copyright = '2013-2016, Piotr Zolnierczuk, Juelich Center for Neutron Science'
author = 'Piotr Zolnierczuk'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
version = pysen.version()
# The full version, including alpha/beta/rc tags.
release = pysen.version(full=True)

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
#
# This is also used if you do content translation via gettext catalogs.
# Usually you set "language" from the command line for these cases.
language = 'en'

# There are two options for replacing |today|: either, you set today to some
# non-false value, then it is used:
#today = ''
# Else, today_fmt is used as the format for a strftime call.
#today_fmt = '%B %d, %Y'

# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
# This patterns also effect to html_static_path and html_extra_path
||||||| 9097e66
# General information about the project.
project = 'PySEN'
copyright = '2013-2016, Piotr Zolnierczuk, Juelich Center for Neutron Science'
author = 'Piotr Zolnierczuk'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
version = pysen.version()
# The full version, including alpha/beta/rc tags.
release = pysen.version(full=True)

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
#
# This is also used if you do content translation via gettext catalogs.
# Usually you set "language" from the command line for these cases.
language = None

# There are two options for replacing |today|: either, you set today to some
# non-false value, then it is used:
#today = ''
# Else, today_fmt is used as the format for a strftime call.
#today_fmt = '%B %d, %Y'

# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
# This patterns also effect to html_static_path and html_extra_path
=======
>>>>>>> docs
exclude_patterns = []

pygments_style = 'sphinx'
todo_include_todos = True


# -- Options for HTML output ----------------------------------------------
html_theme = 'alabaster'
html_static_path = ['_static']
htmlhelp_basename = 'PySENdoc'
+2 −0
Original line number Diff line number Diff line
@@ -106,8 +106,10 @@ def biot_savart_section(r, x1, x2):
    l2 = inner(dx, dx) # a
    r2 = inner(r0, r0)
    rl = inner(r0, dx) # b
    #pylint: disable=no-member
    if r2.shape:
        r2 = diag(r2)
    #pylint: enable=no-member

    db = (l2 - rl)/sqrt(r2 - 2*rl + l2) + rl/sqrt(r2)
    db = db/(l2*r2 - rl*rl)