Skip to content

Commit

Permalink
Trying to upgrade packages and adding possibly problematic package to…
Browse files Browse the repository at this point in the history
… setup.py for installing scikit-image.
  • Loading branch information
apacha committed Jul 4, 2023
1 parent 0e947e0 commit 864afe5
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 62 deletions.
4 changes: 4 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ Changelog

This changelog does not refer to the older `muscima` package.

1.2
---
New release with updated libraries and executed tests with Python 3.11

1.1
---
Performance improvements for loading image masks from RLE string.
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright 2019 Jan Hajič jr. (Faculty of Mathematics and Physics, Charles University) and Alexander Pacha (TU Wien)
Copyright 2023 Jan Hajič jr. (Faculty of Mathematics and Physics, Charles University) and Alexander Pacha (TU Wien)

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ It was used for instance in the [MUSCIMA++](https://ufal.mff.cuni.cz/muscima) da
[![License: CC BY-NC-SA 4.0](https://img.shields.io/badge/License-MIT-brightgreen.svg)](LICENSE.txt)
[![codecov](https://codecov.io/gh/OMR-Research/mung/branch/master/graph/badge.svg)](https://codecov.io/gh/OMR-Research/mung)

Requires Python >= 3.6.
Requires Python >= 3.6 and was tested with Python 3.11.


## Getting started
Expand Down
44 changes: 0 additions & 44 deletions data/__init__.py

This file was deleted.

2 changes: 1 addition & 1 deletion mung/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '1.1'
__version__ = '1.2'
18 changes: 9 additions & 9 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
numpy==1.22.0
lxml==4.9.1
pytest==5.4.1
pytest-cov==2.8.1
scikit-image==0.16.2
scikit-learn==0.22.1
matplotlib==3.2.1
numpy==1.25.0
lxml==4.9.2
pytest==7.4.0
pytest-cov==4.1.0
scikit-image==0.21.0
scikit-learn==1.3.0
matplotlib==3.7.1
MIDIUtil==1.2.1
midi2audio==0.1.1

# Libraries to integrating code-coverage reporting
codecov==2.1.3
coverage==5.0.4
codecov==2.1.13
coverage==7.2.7
14 changes: 8 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,11 @@ def get_long_description():
if os.path.isfile(readme) and os.path.isfile(changes):
long_description = read(readme, changes)
else:
logging.warning('Could not find README.md and CHANGES.md file'
' in directory {0}. Contents:'
' {1}'.format(here, os.listdir(here)))
logging.warning(
'Could not find README.md and CHANGES.md file'
' in directory {0}. Contents:'
' {1}'.format(here, os.listdir(here))
)
long_description = 'Tools for the Music Notation Graph representation of' \
' music notation, used primarily for optical music' \
' recognition. The MUSCIMA++ dataset uses this data' \
Expand All @@ -42,10 +44,10 @@ def get_long_description():
url='https://mung.readthedocs.io',
license='MIT Software License',
author='Jan Hajič jr. and Alexander Pacha',
install_requires=['numpy>=1.11.1',
'lxml>=3.6.4'],
install_requires=['numpy', 'lxml', 'scikit-image'],
author_email='[email protected]',
description='Tools for the Music Notation Graph representation of music notation, used primarily for optical music recognition.',
description='Tools for the Music Notation Graph representation of music notation, used primarily for optical '
'music recognition.',
long_description=get_long_description(),
long_description_content_type="text/markdown",
packages=['mung', 'mung2midi'],
Expand Down

0 comments on commit 864afe5

Please sign in to comment.