Skip to content
This repository has been archived by the owner on Aug 4, 2022. It is now read-only.

Commit

Permalink
Merge branch '0.1.X' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
CCampJr committed May 4, 2018
2 parents 8911efd + 3ba3d12 commit 0a4a457
Show file tree
Hide file tree
Showing 10 changed files with 29 additions and 26 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ nosetests.xml
coverage.xml
*.cover
.hypothesis/
.pytest_cache/

# Translations
*.mo
Expand Down Expand Up @@ -102,3 +103,5 @@ ENV/

# mypy
.mypy_cache/
.pytest_cache/v/cache/nodeids
.pytest_cache/v/cache/nodeids
2 changes: 1 addition & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Changelog
=========

0.1.0 ()
0.1.0 (18-05-04)
----------------

- Initial version
14 changes: 7 additions & 7 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
.. -*- mode: rst -*-
.. image:: https://img.shields.io/travis/CCampJr/LazyHDF5/dev.svg
.. image:: https://img.shields.io/travis/CCampJr/LazyHDF5/master.svg
:alt: Travis branch
:target: https://travis-ci.org/CCampJr/LazyHDF5

.. image:: https://img.shields.io/appveyor/ci/CCampJr/LazyHDF5/dev.svg
.. image:: https://img.shields.io/appveyor/ci/CCampJr/LazyHDF5/master.svg
:alt: AppVeyor branch
:target: https://ci.appveyor.com/project/CCampJr/LazyHDF5

.. image:: https://img.shields.io/codecov/c/github/CCampJr/LazyHDF5/dev.svg
.. image:: https://img.shields.io/codecov/c/github/CCampJr/LazyHDF5/master.svg
:alt: Codecov branch
:target: https://codecov.io/gh/CCampJr/LazyHDF5

Expand All @@ -22,7 +22,7 @@

.. image:: https://img.shields.io/badge/License-NIST%20Public%20Domain-green.svg
:alt: NIST Public Domain
:target: https://github.com/CCampJr/LazyHDF5/blob/dev/LICENSE.md
:target: https://github.com/CCampJr/LazyHDF5/blob/master/LICENSE.md

LazyHDF5: Python Macros for h5py... because I'm lazy
===============================================================
Expand All @@ -35,11 +35,11 @@ facilitates easier use.
Also, an HDF5 file viewer written in PyQt5 (optional, not required
for installation) that displaces groups, datasets, and attributes.

- Inspection
- Inspection

- Get groups, datasets, file hierarchy, dataset attributes

- Editing
- Editing

- Write/alter/re-write attributes (coming soon)
- Repack datasets (coming soon)
Expand Down Expand Up @@ -186,7 +186,7 @@ then left open.
.. code::
# From the command line
python .\lazy5\ui\QtHdfLoad.py
python ./lazy5/ui/QtHdfLoad.py
5. PyQt5 HDF5 file viewer (programmatically)

Expand Down
12 changes: 6 additions & 6 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# https://github.com/astropy/astropy/blob/master/appveyor.yml

branches:
only:
- master
- dev
- version
# except:
# branches:
# only:
# - master
# - dev
# - version
# # except:


environment:
Expand Down
Empty file added lazy5/tests/__init__.py
Empty file.
7 changes: 4 additions & 3 deletions lazy5/tests/test_ui.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,17 @@
try:
from PyQt5.QtWidgets import QApplication
from PyQt5.QtTest import QTest
import PyQt5.QtCore
from PyQt5.QtCore import Qt
except:
FLAG_HAS_PYQT5 = False
HAS_PYQT5 = False
else:
FLAG_HAS_PYQT5 = True
HAS_PYQT5 = True
from lazy5.ui.QtHdfLoad import HdfLoad

from lazy5.utils import hdf_is_open

@pytest.mark.skipif(not FLAG_HAS_PYQT5, reason='PyQt5 not installed, skipping.')
@pytest.mark.skipif(not HAS_PYQT5, reason='PyQt5 not installed, skipping.')
class TestUI:
""" Test the HDF5 PyQt5 Viewer """

Expand Down
11 changes: 5 additions & 6 deletions lazy5/ui/QtHdfLoad.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,10 @@
QDialog as _QDialog, QFileDialog as _QFileDialog, \
QTableWidgetItem as _QTableWidgetItem)
except:
has_PyQt5 = False
HAS_PYQT5 = False
else:
has_PyQt5 = True
from lazy5.ui.qt_HdfLoad import Ui_Dialog
# import numpy as _np
HAS_PYQT5 = True
from lazy5.ui.qt_HdfLoad import Ui_Dialog

from lazy5.inspect import get_hierarchy, get_attrs_dset
from lazy5.nonh5utils import filterlist
Expand Down Expand Up @@ -105,7 +104,7 @@ def fileOpen(self, pth='./'): # Qt-related pylint: disable=C0103
full_pth_fname = pth
else:
raise FileNotFoundError('Not a valid path. Not a valid file.')

ret = None
if full_pth_fname:
full_pth_fname = _os.path.abspath(full_pth_fname) # Ensure correct /'s for each OS
Expand Down Expand Up @@ -154,7 +153,7 @@ def populate_attrs(self, attr_dict=None):

def datasetSelected(self): # Qt-related pylint: disable=C0103
""" Action : One or more DataSets were selected from the list """

all_selected = self.ui.listDataSet.selectedItems()
n_selected = len(all_selected)

Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions pylintrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[MASTER]
ignore-patterns= qt_*
# [MASTER]
# ignore-patterns= qt_*
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
long_description = f.read()

setup(name='LazyHDF5',
version = '0.1.0a0',
version = '0.1.0a1',
description = 'Python Macros for h5py... because I\'m lazy',
long_description = long_description,
url = 'https://github.com/CCampJr/LazyHDF5',
Expand Down

0 comments on commit 0a4a457

Please sign in to comment.