Skip to content

Commit c382b82

Browse files
committed
Bump version
1 parent cf3f6b1 commit c382b82

7 files changed

Lines changed: 11 additions & 97 deletions

File tree

.travis.yml

Lines changed: 1 addition & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
language: python
2+
script: tox -e repo-test
23
jobs:
34
include:
45

@@ -8,92 +9,5 @@ jobs:
89
language: python
910
python: 3.6
1011
before_install:
11-
- sudo rm /usr/bin/python
12-
- sudo ln -s /usr/bin/python3 /usr/bin/python
13-
- python3 --version
14-
- python3 -m pip install tox-travis
15-
16-
- name: "Python 3.7 on Linux"
17-
os: linux
18-
dist: xenial
19-
language: python
20-
python: 3.7
21-
before_install:
22-
- sudo rm /usr/bin/python
23-
- sudo ln -s /usr/bin/python3 /usr/bin/python
2412
- python3 --version
2513
- python3 -m pip install tox-travis
26-
27-
- name: "Python 3.8 on Linux"
28-
os: linux
29-
dist: xenial
30-
language: python
31-
python: 3.8
32-
before_install:
33-
- sudo rm /usr/bin/python
34-
- sudo ln -s /usr/bin/python3 /usr/bin/python
35-
- python3 --version
36-
- python3 -m pip install tox-travis
37-
38-
- name: "Python 3.6 on macOS"
39-
os: osx
40-
osx_image: xcode9.4
41-
language: shell
42-
before_install:
43-
- python3 --version
44-
- python3 -m pip install --upgrade pip
45-
- sudo pip install tox-travis
46-
script: sudo tox -e repo-test
47-
48-
- name: "Python 3.7 on macOS"
49-
os: osx
50-
osx_image: xcode11.4
51-
language: shell
52-
before_install:
53-
- python3 --version
54-
- python3 -m pip install --upgrade pip
55-
- sudo pip install tox-travis
56-
script: sudo tox -e repo-test
57-
58-
- name: "Python 3.8 on macOS"
59-
os: osx
60-
osx_image: xcode11.6
61-
language: shell
62-
before_install:
63-
- python3 --version
64-
- python3 -m pip install --upgrade pip
65-
- sudo pip install tox-travis
66-
script: sudo tox -e repo-test
67-
68-
- name: "Python 3.6 on Windows"
69-
os: windows
70-
language: shell
71-
before_install:
72-
- choco install python --version 3.6.5
73-
- python --version
74-
- python -m pip install --upgrade pip
75-
- python -m pip install tox-travis
76-
env: PATH=/c/Python36:/c/Python36/Scripts:$PATH
77-
78-
- name: "Python 3.7 on Windows"
79-
os: windows
80-
language: shell
81-
before_install:
82-
- choco install python --version 3.7.4
83-
- python --version
84-
- python -m pip install --upgrade pip
85-
- python -m pip install tox-travis
86-
env: PATH=/c/Python37:/c/Python37/Scripts:$PATH
87-
88-
- name: "Python 3.8 on Windows"
89-
os: windows
90-
language: shell
91-
before_install:
92-
- choco install python --version 3.8.8
93-
- python --version
94-
- python -m pip install --upgrade pip
95-
- python -m pip install tox-travis
96-
env: PATH=/c/Python38:/c/Python38/Scripts:$PATH
97-
98-
script: tox -e repo-test
99-
install: pip install --upgrade pip

CHANGES.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,4 @@ v0.2.2b0:
2828
v0.2.2b1:
2929
2022-11-15 3879436 Remove depreciated (and unneeded) fig.canvas.set_window_title
3030
v0.2.2:
31+
v0.2.3b0:

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ PYTHONS=3.9 3.8 3.7 3.6 3.5
6565

6666
# VERSION is updated in "make version-update" step and derived
6767
# from CHANGES.txt. Do not edit.
68-
VERSION=0.2.2
68+
VERSION=0.2.3b0
6969
SHELL:= /bin/bash
7070

7171
LONG_TESTS=false

hapiplot/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616
#ignores = ['datapath','savefig.frameon', 'text.latex.unicode', 'verbose.fileo', 'verbose.level', 'datapath']
1717
warnings.filterwarnings(action='ignore', category=UserWarning)
1818

19-
__version__ = '0.2.2'
19+
__version__ = '0.2.3b0'

hapiplot/hapiplot.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
def hapiplot(*args, **kwargs):
1818
"""Plot response from HAPI server.
1919
20-
Version: 0.2.2
20+
Version: 0.2.3b0
2121
2222
Demos
2323
-----

setup.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#install_requires = ["matplotlib", "hapiclient @ git+https://github.com/hapi-server/client-python#egg=hapiclient"]
55
install_requires = ["matplotlib", "hapiclient>0.1.7"]
66

7+
# python setup.py develop will install these deps
78
if len(sys.argv) > 1 and sys.argv[1] == 'develop':
89
install_requires.append("deepdiff<3.3.0")
910
install_requires.append("pillow==8.0")
@@ -18,10 +19,12 @@
1819
# Perhaps old version of pip causes this?
1920
install_requires.append("pytest")
2021

22+
#install_requires.append("pytest")
23+
print(install_requires)
2124
# version is modified by misc/version.py (executed from Makefile). Do not edit.
2225
setup(
2326
name='hapiplot',
24-
version='0.2.2',
27+
version='0.2.3b0',
2528
author='Bob Weigel',
2629
author_email='rweigel@gmu.edu',
2730
packages=find_packages(),

tox.ini

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
[tox]
2-
envlist = py36,py37,py38
2+
envlist = py36
33
skip_missing_interpreters = true
44

55
[testenv:repo-test]
66
setenv =
77
WINDIR = C:\Windows
88
pip_pre=true
9-
deps =
10-
pytest==6.*
11-
pillow
129
commands =
13-
pip install -e . --pre
14-
python -m pip install hapiplot --upgrade
10+
pip install develop -e .
1511
python -m pytest -rx -rP -v test/test_hapiplot.py

0 commit comments

Comments
 (0)