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
bcfc9d49
Commit
bcfc9d49
authored
7 years ago
by
Jan Caron
Browse files
Options
Downloads
Patches
Plain Diff
Rolled back environment.yml to use pip install -e .['tests']
Installing EVERYTHING with pip was not a smart idea...
parent
5dfef1fc
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+2
-1
2 additions, 1 deletion
.gitlab-ci.yml
setup.py
+1
-0
1 addition, 0 deletions
setup.py
with
3 additions
and
1 deletion
.gitlab-ci.yml
+
2
−
1
View file @
bcfc9d49
...
@@ -27,7 +27,8 @@ test:
...
@@ -27,7 +27,8 @@ test:
# TODO: Different jobs with custom develop arguments? extra_requires (hyperspy, plotting)?
# TODO: Different jobs with custom develop arguments? extra_requires (hyperspy, plotting)?
# TODO: Use pip install -e .[hyperspy], etc.
# TODO: Use pip install -e .[hyperspy], etc.
# Install requirements:
# Install requirements:
-
pip install -r requirements.txt
# TODO: Use conda docker image if available!?
# - pip install -r requirements.txt # TODO: DOES NOT WORK (because mayavi and stuff...)
-
pip install -e .['tests']
-
python setup.py test
-
python setup.py test
-
coverage html
-
coverage html
artifacts
:
artifacts
:
...
...
This diff is collapsed.
Click to expand it.
setup.py
+
1
−
0
View file @
bcfc9d49
...
@@ -128,6 +128,7 @@ def get_files(rootdir):
...
@@ -128,6 +128,7 @@ def get_files(rootdir):
return
filepaths
return
filepaths
# TODO: Outsource stuff to setup.cfg? See https://github.com/pypa/setuptools/pull/862
# TODO: Use requirements.txt? extras_require for optional stuff (hyperspy, plotting)?
# TODO: Use requirements.txt? extras_require for optional stuff (hyperspy, plotting)?
# TODO: After split of Pyramid, comment out and see what really is used (is e.g. scipy?)!
# TODO: After split of Pyramid, comment out and see what really is used (is e.g. scipy?)!
...
...
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