Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
empyre
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Dieter Weber
empyre
Commits
144768b0
Commit
144768b0
authored
7 years ago
by
Jan Caron
Browse files
Options
Downloads
Patches
Plain Diff
Trying to fix gitlab-ci.yml!
parent
72ac62d8
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+1
-0
1 addition, 0 deletions
.gitlab-ci.yml
environment.yml
+4
-4
4 additions, 4 deletions
environment.yml
pyramid/plottools.py
+2
-1
2 additions, 1 deletion
pyramid/plottools.py
with
7 additions
and
5 deletions
.gitlab-ci.yml
+
1
−
0
View file @
144768b0
...
...
@@ -116,6 +116,7 @@ test_conda:
-
conda env create -q
# -q: quiet/ no progressbar, because it spams the log!
-
source activate pyramid
-
conda info --envs
-
conda install pyqt=5.6.0 -y
# This is needed for tests to run, but breaks mayavi (not used)!
# Install jutil via secure ssh connection:
-
pip install git+ssh://gitlab@iffgit.fz-juelich.de/unger/jutil.git
# Execute tests:
...
...
This diff is collapsed.
Click to expand it.
environment.yml
+
4
−
4
View file @
144768b0
...
...
@@ -2,6 +2,7 @@
# This file contains the top level dependencies of the pyramid project!
# requirements.txt also contains sub-dependencies, generated by "pip freeze > requirements.txt"!
# Add new dependencies here, then "conda env update", then "pip freeze > requirements.txt"!
# To see if compatible upgrades are available for the current packages, use "conda upgrade --all"!
# When packages are deprecated/deleted, it may be best to recreate the environment from scratch!
name
:
pyramid
...
...
@@ -22,15 +23,14 @@ dependencies:
-
pyFFTW=0.10
# File IO:
-
hyperspy=1.3
#
- hyperspy-gui-ipywidgets=1.0
-
hyperspy-gui-ipywidgets=1.0
# - hyperspy-gui-traitsui=1.0 # TODO: Optional! Delete when mayavi is gone!
-
h5py=2.7
# Plotting and colors: # TODO: Shift to plotting package?
-
matplotlib=2.0
# Only
works with qt4 from conda-forge channel
!
-
matplotlib=2.0
# Only
conda-forge channel has working version for qt4
!
-
Pillow=4.1
-
cmocean=1.1
# - qt=4.8 # Necessary because of traits in mayavi...
-
pyqt=5.6.0
-
qt=4.8
# Necessary because of traits in mayavi... On server, pyqt=5.6 is needed!
-
mayavi=4.5
# TODO: Get rid of!
#- colorspacious # TODO: NOT USED?
#- visvis # TODO: NOT USED?
...
...
This diff is collapsed.
Click to expand it.
pyramid/plottools.py
+
2
−
1
View file @
144768b0
...
...
@@ -28,13 +28,14 @@ FIGSIZE_DEFAULT = (6.7, 5) # TODO: Apparently does not fit as well as before...
FONTSIZE_DEFAULT
=
20
STROKE_DEFAULT
=
None
# TODO: Replace by matplotlib styles!
def
pretty_plots
(
figsize
=
None
,
fontsize
=
None
,
stroke
=
None
):
"""
Set IPython formats (for interactive and PDF output) and set pretty matplotlib font.
"""
from
IPython.display
import
set_matplotlib_formats
set_matplotlib_formats
(
'
png
'
,
'
pdf
'
)
# png for interactive, pdf, for PDF output!
mpl
.
rcParams
[
'
mathtext.fontset
'
]
=
'
stix
'
# Mathtext in $...$!
mpl
.
rcParams
[
'
font.family
'
]
=
'
STIXGeneral
'
# Set normal text to look the same!
# TODO: set 'font.size' = FONTSIZE! Does this change everything relative to this value???
mpl
.
rcParams
[
'
figure.max_open_warning
'
]
=
0
# Disable Max Open Figure warning!
if
figsize
is
not
None
:
global
FIGSIZE_DEFAULT
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment