Skip to content

Commit c30a070

Browse files
committed
Update project configuration:
- Update readme. - Add readme text to setup.py. - Skip plot example tests on platforms other than Windows. - Add Travis CI and update AppVeyor configuration. - Update changelog. - Add dependencies to setup.py. - Add NDTable native libraries.
1 parent 3a38bcb commit c30a070

File tree

15 files changed

+141
-45
lines changed

15 files changed

+141
-45
lines changed

.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@
1010
# compiled code
1111
*.py[cod]
1212

13-
# C extensions
14-
*.so
15-
1613
# Packages
1714
*.egg
1815
*.egg-info

.travis.yml

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
language: python
2+
3+
matrix:
4+
include:
5+
- os: linux
6+
env:
7+
- PYTHON_VERSION=2.7
8+
- MINICONDA=Miniconda2-latest-Linux-x86_64.sh
9+
10+
- os: linux
11+
env:
12+
- PYTHON_VERSION=3.6
13+
- MINICONDA=Miniconda3-latest-Linux-x86_64.sh
14+
15+
- os: osx
16+
language: generic
17+
env:
18+
- PYTHON_VERSION=2.7
19+
- MINICONDA=Miniconda2-latest-MacOSX-x86_64.sh
20+
21+
- os: osx
22+
language: generic
23+
env:
24+
- PYTHON_VERSION=3.6
25+
- MINICONDA=Miniconda3-latest-MacOSX-x86_64.sh
26+
27+
install:
28+
# download and install miniconda
29+
- wget https://repo.continuum.io/miniconda/$MINICONDA -O miniconda.sh
30+
- bash miniconda.sh -b -p $HOME/miniconda
31+
- export PATH="$HOME/miniconda/bin:$PATH"
32+
- hash -r
33+
- conda config --set always_yes yes --set changeps1 no
34+
- conda update -q conda
35+
36+
# useful for debugging any issues with conda
37+
- conda info -a
38+
39+
# create the conda environment
40+
- conda create -q -n test-env python=$PYTHON_VERSION
41+
- source activate test-env
42+
43+
# build the wheel
44+
- python setup.py bdist_wheel --universal
45+
46+
# install the wheel and its dependencies
47+
- |
48+
for f in dist/SDF-*.whl; do
49+
pip install $f
50+
done
51+
52+
script:
53+
- cd tests
54+
- python -m unittest discover
55+
- cd ..
56+
57+
deploy:
58+
provider: pypi
59+
user: t-sommer
60+
password:
61+
secure: H4EFw/NtTmmFLOB2yjP8d3uqsPDCzG4WV7RbeEu3rRwz39cZxKkBEvBokKYVPo7tLRwWTQjYGbrwOaLME3hBNo0Mjc9d99Ivcy6UTeE4T6AUln//STDOjy2geJnkBCStZ5I21N+bVom6lzT0Oe0EUnJNBQWnJza7EuMSoTdaH3us5Obtc3F1dqbUensdvaUUvZw9Px7lIQ2C1drwgZvh3yArXX8rVAtxq9wpa601G6tKtrwRcgS4v1jAK8p7MJdFVA/9i5ZAXB/L4waE3pv+k52bjFJ9lcaYOwYcxBedqriKYV78q0+VmBn1TfMK0oNEDgg7abVjZwnx17oGvm389BeEFzN7GXX3RsoNNUlcMFXEEaFVuCWwXNG3Sx6HHsz9zyOE6jbhMt1ag4VHZsCoWO/UoXL7jbd46kBIOuixVgkPZlQSP6FA0/jch85940tYtPQXBxldOiwjYyFFUxv/47iTaB0aAt6Elm+2c/dxgDd0jS/FwmGdChrYcjLU8qjy2/ApMps1C2u00nxN6P/OxqbY0fIqgBFHQOsEgEoSe6sGDzPTOtQrsp/3pP3At1KR8czBkTUxWb+5Xa+ObM/qc4Jcy3QAoLRlGIyId9frOpViI/VgM4RpT+i0chaOwY4yFAexkWwGtWST58VKgvnzYTtnTQ/g+fRgFal3NtkEWUo=
62+
distributions: bdist_wheel --universal
63+
skip_cleanup: true

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
# Changelog
22

3+
## [0.3.3] (unreleased)
4+
5+
### Changed
6+
- Distribution package changed from .tar.gz to .whl (Python Wheel)
7+
- DLLs are now signed
38

49
## [0.3.2] (2017-07-09)
10+
511
### Added
612
- Support for Linux and Mac

README.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.. image:: https://ci.appveyor.com/api/projects/status/github/ScientificDataFormat/SDF-Python?branch=master
22

3+
34
Scientific Data Format for Python
45
=================================
56

@@ -19,15 +20,13 @@ For detailed information see the `SDF specification`_.
1920
Installation
2021
------------
2122

22-
Install the latest release from PyPI::
23+
To install the latest release from `PyPI <https://pypi.python.org/pypi/sdf/>`_ or update an existing installation::
2324

24-
$ pip install sdf
25+
python -m pip install --upgrade sdf
2526

26-
or install the latest development version from source::
27+
To install the latest development version::
2728

28-
$ git clone --branch develop --recursive https://github.com/ScientificDataFormat/SDF-Python.git
29-
$ cd SDF-Python
30-
$ pip install .
29+
python -m pip install --upgrade https://github.com/ScientificDataFormat/SDF-Python/archive/develop.zip
3130

3231

3332
Tutorial
@@ -73,8 +72,9 @@ Get the scale for the first dimension:
7372

7473
-----------------------------
7574

76-
|copy| 2017 Dassault Systèmes
75+
|copyright| 2017 |Dassault Systemes|
7776

7877
.. _SDF specification: https://github.com/ScientificDataFormat/SDF
7978
.. _HDF5: https://www.hdfgroup.org/hdf5/
80-
.. |copy| unicode:: U+000A9
79+
.. |copyright| unicode:: U+000A9
80+
.. |Dassault Systemes| unicode:: Dassault U+0020 Syst U+00E8 mes

appveyor.yml

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,42 @@
1-
image: Visual Studio 2015
2-
31
build: false
42

53
environment:
4+
65
matrix:
76
- PYTHON_VERSION: 2.7
87
MINICONDA: C:\Miniconda
9-
- PYTHON_VERSION: 3.6
10-
MINICONDA: C:\Miniconda3
8+
9+
- PYTHON_VERSION: 3.5
10+
MINICONDA: C:\Miniconda35
11+
12+
- PYTHON_VERSION: 2.7
13+
MINICONDA: C:\Miniconda-x64
14+
15+
- PYTHON_VERSION: 3.5
16+
MINICONDA: C:\Miniconda35-x64
1117

1218
init:
13-
- "echo %PYTHON_VERSION% %MINICONDA%"
19+
- echo %PYTHON_VERSION% %MINICONDA%
1420

1521
install:
1622
- git submodule update --init --recursive
17-
- "set PATH=%MINICONDA%;%MINICONDA%\\Scripts;%PATH%"
23+
- set PATH=%MINICONDA%;%MINICONDA%\\Scripts;%PATH%
1824
- conda config --set always_yes yes --set changeps1 no
1925
- conda update -q conda
2026
- conda info -a
21-
- "conda create -q -n test-environment python=%PYTHON_VERSION% numpy h5py matplotlib scipy"
22-
- activate test-environment
23-
- pip install dymat
27+
- conda create -q -n test-env python=%PYTHON_VERSION%
28+
- activate test-env
29+
30+
# build the wheel
31+
- python setup.py bdist_wheel --universal
32+
33+
# install the wheel and its dependencies
34+
- for %%f in (dist\SDF-*.whl) do pip install %%f
2435

2536
test_script:
26-
- python -m doctest README.rst
27-
- build_windows
28-
- pip install .
2937
- cd tests
30-
- python test_sdf.py
38+
- python -m unittest discover
39+
40+
artifacts:
41+
# archive the generated wheel in the build report
42+
- path: dist\*

sdf/darwin64/.gitignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

sdf/darwin64/libNDTable.dylib

30 KB
Binary file not shown.

sdf/linux64/.gitignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

sdf/linux64/libndtable.so

25.5 KB
Binary file not shown.

sdf/win32/.gitignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)