Skip to content
Snippets Groups Projects
Commit 308cf606 authored by Maeva Pourpoint's avatar Maeva Pourpoint
Browse files

Update out of date info from cookiecutter and remove unused Makefile

parent e0abb3a1
No related branches found
No related tags found
1 merge request!10Formatting and cookiecutter files cleanup
......@@ -99,13 +99,13 @@ guidelines:
2. If the merge request adds functionality, the docs should be
updated. Put your new functionality into a function with a
docstring, and add the feature to the list in README.rst.
3. The pull request should work for Python 2.7
3. The pull request should work for Python3.[6,7,8]
Tips
----
To run a subset of tests::
$ python -m unittest tests.test_bline
$ python -m unittest
Deploying
---------
......
......@@ -57,3 +57,14 @@ History
replaced with characters, so the program was not detecting high
sample rate files correctly.
2020.201 (2020-07-20)
------------------
* Updated to work with Python 3
* Added a unit test to test bline import
* Updated list of platform specific dependencies to be installed when
pip installing bline (see setup.py)
* Installed and tested bline against Python3.[6,7,8] using tox
* Formatted Python code to conform to the PEP8 style guide
* Created conda packages for bline that can run on Python3.[6,7,8]
* Updated .gitlab-ci.yml to run a linter and unit tests for Python3.[6,7,8]
in GitLab CI pipeline
......@@ -5,7 +5,5 @@ include LICENSE
include README.rst
recursive-include tests *
recursive-exclude * __pycache__
recursive-exclude * *.py[co]
recursive-include docs *.rst conf.py Makefile make.bat *.jpg *.png *.gif
recursive-include docs *.rst conf.py
......@@ -15,12 +15,3 @@ Features
offloaded files have been received and are not badly corrupted.
* BaleAddr-like functionality to assign IP address to balers will be
added in the future.
Credits
-------
This package was created with Cookiecutter_ and the `passoft/cookiecutter`_ project template.
.. _Cookiecutter: https://github.com/audreyr/cookiecutter
.. _`passoft/cookiecutter`: https://git.passcal.nmt.edu/passoft/cookiecutter
[bumpversion]
current_version = 2019.297
commit = True
tag = True
[bumpversion:file:setup.py]
search = version='{current_version}'
replace = version='{new_version}'
[bumpversion:file:bline/__init__.py]
search = __version__ = '{current_version}'
replace = __version__ = '{new_version}'
[bdist_wheel]
universal = 1
[flake8]
exclude = docs
[aliases]
# Define setup.py command aliases here
......@@ -34,15 +34,8 @@ setup(
setup_requires=[],
extras_require={
'dev': [
'pip',
'bumpversion',
'wheel',
'watchdog',
'flake8',
'tox',
'coverage',
'Sphinx',
'twine',
]
},
license="GNU General Public License v3",
......@@ -51,7 +44,6 @@ setup(
keywords='bline',
name='bline',
packages=find_packages(include=['bline']),
test_suite='tests',
url='https://git.passcal.nmt.edu/passoft/bline',
version='2019.297',
zip_safe=False,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment