Skip to content

Commit d5e1e68

Browse files
authored
[MRG] Add some polish (#24)
1 parent 528ed86 commit d5e1e68

File tree

4 files changed

+12
-18
lines changed

4 files changed

+12
-18
lines changed

.github/workflows/wheel-builds.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ name: wheels
33
on:
44
push:
55
branches: [ master ]
6-
pull_request:
7-
branches: [ master ]
86

97
jobs:
108
build_wheels:

README.md

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
[![Build Status](https://github.com/scaramallion/pylibjpeg-openjpeg/workflows/build/badge.svg)](https://github.com/scaramallion/pylibjpeg-openjpeg/actions?query=workflow%3Abuild)
2-
[![codecov](https://codecov.io/gh/scaramallion/pylibjpeg-openjpeg/branch/master/graph/badge.svg)](https://codecov.io/gh/scaramallion/pylibjpeg-openjpeg)
1+
[![Build Status](https://github.com/pydicom/pylibjpeg-openjpeg/workflows/build/badge.svg)](https://github.com/pydicom/pylibjpeg-openjpeg/actions?query=workflow%3Abuild)
2+
[![Build Status](https://github.com/pydicom/pylibjpeg-openjpeg/workflows/wheels/badge.svg)](https://github.com/pydicom/pylibjpeg-openjpeg/actions?query=workflow%3Awheels)
3+
[![codecov](https://codecov.io/gh/pydicom/pylibjpeg-openjpeg/branch/master/graph/badge.svg)](https://codecov.io/gh/pydicom/pylibjpeg-openjpeg)
4+
[![PyPI version](https://badge.fury.io/py/pylibjpeg-openjpeg.svg)](https://badge.fury.io/py/pylibjpeg-openjpeg)
5+
[![Python versions](https://img.shields.io/pypi/pyversions/pylibjpeg-openjpeg.svg)](https://img.shields.io/pypi/pyversions/pylibjpeg-openjpeg.svg)
36

47
## pylibjpeg-openjpeg
58

@@ -14,7 +17,9 @@ Linux, OSX and Windows are all supported.
1417
[NumPy](http://numpy.org)
1518

1619
#### Installing the current release
17-
Not yet available
20+
```bash
21+
python -m pip install -U pylibjpeg-openjpeg
22+
```
1823

1924
#### Installing the development version
2025

@@ -31,7 +36,7 @@ python -m pip install pylibjpeg-openjpeg
3136

3237
| ISO/IEC Standard | ITU Equivalent | JPEG Format |
3338
| --- | --- | --- |
34-
| [15444-1](https://www.iso.org/standard/78321.html) | [T.800](https://www.itu.int/rec/T-REC-T.800/en) | [JPEG 2000](https://jpeg.org/jpeg2000/) |
39+
| [15444-1](https://www.iso.org/standard/78321.html) | [T.800](https://www.itu.int/rec/T-REC-T.800/en) | [JPEG 2000](https://jpeg.org/jpeg2000/) |
3540

3641
#### Encoding
3742
Encoding of JPEG 2000 images is not currently supported
File renamed without changes.

setup.py

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,24 +35,19 @@ def get_source_files():
3535
"""Return a list of paths to the source files to be compiled."""
3636
source_files = [
3737
"openjpeg/_openjpeg.pyx",
38-
os.path.join(INTERFACE_SRC, "utils.c"),
38+
os.path.join(INTERFACE_SRC, "decode.c"),
3939
]
4040
for fname in Path(OPENJPEG_SRC).glob("*"):
4141
if fname.parts[-1].startswith("test"):
4242
continue
4343

44-
#if fname.parts[-1].startswith("t1"):
45-
# continue
46-
4744
if fname.parts[-1].startswith("bench"):
4845
continue
4946

5047
fname = str(fname)
5148
if fname.endswith(".c"):
5249
source_files.append(fname)
5350

54-
print(source_files)
55-
5651
return source_files
5752

5853

@@ -147,11 +142,7 @@ def setup_oj():
147142
"Intended Audience :: Developers",
148143
"Intended Audience :: Healthcare Industry",
149144
"Intended Audience :: Science/Research",
150-
"Development Status :: 1 - Planning",
151-
#"Development Status :: 2 - Pre-Alpha",
152-
#"Development Status :: 3 - Alpha",
153-
#"Development Status :: 4 - Beta",
154-
#"Development Status :: 5 - Production/Stable",
145+
"Development Status :: 5 - Production/Stable",
155146
"Natural Language :: English",
156147
"Programming Language :: Python :: 3.6",
157148
"Programming Language :: Python :: 3.7",
@@ -171,6 +162,6 @@ def setup_oj():
171162
"1.2.840.10008.1.2.4.90 = openjpeg:decode_pixel_data",
172163
"1.2.840.10008.1.2.4.91 = openjpeg:decode_pixel_data",
173164
],
174-
"pylibjpeg.jpeg2k_decoders": "openjpeg = openjpeg:decode",
165+
"pylibjpeg.jpeg_2000_decoders": "openjpeg = openjpeg:decode",
175166
}
176167
)

0 commit comments

Comments
 (0)