Skip to content

Commit

Permalink
update pysettings
Browse files Browse the repository at this point in the history
  • Loading branch information
UmSenhorQualquer committed Feb 21, 2018
1 parent d58951c commit 6933720
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion docs/source/getting-started.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ This library requires the next Python 3 packages to be installed.
- sip
- pyqt5
- matplotlib
- https://github.com/UmSenhorQualquer/pysettings.git
- https://github.com/UmSenhorQualquer/pyforms.git
- https://UmSenhorQualquer@bitbucket.org/fchampalimaud/logging-bootstrap.git
- https://github.com/UmSenhorQualquer/pyforms.git

Expand Down
2 changes: 1 addition & 1 deletion pybpod_rotaryencoder_module/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

__version__ = "0"

from pysettings import conf
from pyforms import conf

conf += 'pybpod_rotaryencoder_module.settings'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# !/usr/bin/python3
# -*- coding: utf-8 -*-
from pysettings import conf
from pyforms import conf
if conf.PYFORMS_USE_QT5:
from PyQt5.QtGui import QIcon
else:
Expand Down
2 changes: 1 addition & 1 deletion pybpod_rotaryencoder_module/module_gui.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from pybpod_rotaryencoder_module.module_api import RotaryEncoderModule
from sca.formats import csv
from datetime import datetime
from pysettings import conf
from pyforms import conf

if conf.PYFORMS_USE_QT5:
from PyQt5.QtCore import QTimer, QEventLoop
Expand Down
2 changes: 1 addition & 1 deletion requirements-rtd.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ sphinx_rtd_theme>=0.2.4
recommonmark

# swp dependencies
git+https://github.com/UmSenhorQualquer/pysettings.git
git+https://github.com/UmSenhorQualquer/pyforms.git
https://bitbucket.org/fchampalimaud/logging-bootstrap/get/master.zip
https://github.com/UmSenhorQualquer/pyforms/archive/master.zip
https://bitbucket.org/fchampalimaud/pybpod-api/get/master.zip
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ pyqt5
matplotlib

# swp dependencies
git+https://github.com/UmSenhorQualquer/pysettings.git
git+https://github.com/UmSenhorQualquer/pyforms.git
git+https://github.com/UmSenhorQualquer/pyforms.git
git+https://UmSenhorQualquer@bitbucket.org/fchampalimaud/logging-bootstrap.git

0 comments on commit 6933720

Please sign in to comment.