Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR: Add Material Design Icon support #89

Closed
wants to merge 12 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
107 changes: 0 additions & 107 deletions .ciocheck

This file was deleted.

41 changes: 41 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
version: 2

main: &main
machine: true
steps:
- checkout
- run:
command: docker pull dorowu/ubuntu-desktop-lxde-vnc:trusty
- run:
name: Install system packages
command: |
sudo apt-get update
sudo apt-get install libegl1-mesa
- run:
command: ./.circleci/install.sh
- run:
command: ./.circleci/run_tests.sh

jobs:
python2.7:
<<: *main
environment:
- PYTHON_VERSION: "2.7"

python3.5:
<<: *main
environment:
- PYTHON_VERSION: "3.5"

python3.6:
<<: *main
environment:
- PYTHON_VERSION: "3.6"

workflows:
version: 2
build_and_test:
jobs:
- python2.7
- python3.5
- python3.6
17 changes: 17 additions & 0 deletions .circleci/install.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/bin/bash

export TRAVIS_OS_NAME="linux"
export CONDA_DEPENDENCIES_FLAGS="--quiet"
export CONDA_DEPENDENCIES="qtpy pyqt pytest pytest-cov six"
export PIP_DEPENDENCIES="codecov"

# Download and install miniconda and conda/pip dependencies
# with astropy helpers
echo -e "PYTHON = $PYTHON_VERSION \n============"
git clone git://github.com/astropy/ci-helpers.git > /dev/null
source ci-helpers/travis/setup_conda_$TRAVIS_OS_NAME.sh
export PATH="$HOME/miniconda/bin:$PATH"
source activate test

# Install the package in develop mode
python setup.py develop
18 changes: 18 additions & 0 deletions .circleci/run_tests.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#!/bin/bash

export PATH="$HOME/miniconda/bin:$PATH"
source activate test

python example.py

if [ $? -ne 0 ]; then
exit 1
fi

pytest -x -vv --cov=qtawesome --cov-report=term-missing qtawesome

if [ $? -ne 0 ]; then
exit 1
fi

codecov
24 changes: 24 additions & 0 deletions .codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
codecov:
branch: master

coverage:
precision: 2
round: down
range: "70...100"

status:
project:
default:
threshold: 1%
patch: no
changes: no

parsers:
gcov:
branch_detection:
conditional: yes
loop: yes
method: no
macro: no

comment: false
72 changes: 0 additions & 72 deletions .travis.yml

This file was deleted.

3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@

## Build status

[![Travis](https://travis-ci.org/spyder-ide/qtawesome.svg?branch=master)](https://travis-ci.org/spyder-ide/qtawesome)
[![Appveyor](https://ci.appveyor.com/api/projects/status/un8vnw4628cl6qfu?svg=true)](https://ci.appveyor.com/project/spyder-ide/qtawesome)
[![CircleCI](https://circleci.com/gh/spyder-ide/qtawesome/tree/master.svg?style=shield)](https://circleci.com/gh/spyder-ide/qtawesome/tree/master)
[![Scrutinizer](https://scrutinizer-ci.com/g/spyder-ide/qtawesome/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/spyder-ide/qtawesome/?branch=master)
[![codecov](https://codecov.io/gh/spyder-ide/qtawesome/branch/master/graph/badge.svg)](https://codecov.io/gh/spyder-ide/qtawesome)

----

Expand Down
23 changes: 4 additions & 19 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,13 @@ environment:
global:
PYTHON: "C:\\conda"
CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\ci-helpers\\appveyor\\windows_sdk.cmd"
PYTHON_ARCH: "64" # needs to be set for CMD_IN_ENV to succeed. If a mix
# of 32 bit and 64 bit builds are needed, move this
# to the matrix section.
PYTHON_ARCH: "64"
CONDA_DEPENDENCIES: "qtpy pyqt pytest six"
matrix:
# PyQt5
- PYTHON_VERSION: "3.6"
- PYTHON_VERSION: "3.5"
CONDA_DEPENDENCIES: "qt=5.* pyqt=5.*"
- PYTHON_VERSION: "3.4"
CONDA_DEPENDENCIES: "qt=5.* pyqt=5.*"
- PYTHON_VERSION: "2.7"
CONDA_DEPENDENCIES: "qt=5.* pyqt=5.*"
# PyQt4
- PYTHON_VERSION: "3.5"
CONDA_DEPENDENCIES: "qt=4.* pyqt=4.*"
- PYTHON_VERSION: "3.4"
CONDA_DEPENDENCIES: "qt=4.* pyqt=4.*"
- PYTHON_VERSION: "2.7"
CONDA_DEPENDENCIES: "qt=4.* pyqt=4.*"
# PySide
# - PYTHON_VERSION: "2.7"
# CONDA_DEPENDENCIES: "qt=4.* pyside"

platform:
-x64
Expand All @@ -50,12 +36,11 @@ install:
- "powershell ci-helpers/appveyor/install-miniconda.ps1"
- "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
- "activate test"
- "conda install ciocheck -c conda-forge"
- "python setup.py develop"

# Not a .NET project, we build in the install step instead
build: false

test_script:
- "%CMD_IN_ENV% python example.py"
- "%CMD_IN_ENV% py.test qtawesome"
- "%CMD_IN_ENV% pytest -x -vv qtawesome"
32 changes: 0 additions & 32 deletions circle.yml

This file was deleted.

4 changes: 3 additions & 1 deletion qtawesome/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ def _instance():
if _resource['iconic'] is None:
_resource['iconic'] = IconicFont(
('fa', 'fontawesome-webfont.ttf', 'fontawesome-webfont-charmap.json'),
('ei', 'elusiveicons-webfont.ttf', 'elusiveicons-webfont-charmap.json')
('ei', 'elusiveicons-webfont.ttf', 'elusiveicons-webfont-charmap.json'),
('mdi', 'materialdesignicons-webfont.ttf',
'materialdesignicons-webfont-charmap.json')
)
return _resource['iconic']

Expand Down
Loading