Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
H
hydesign
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
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TOPFARM
hydesign
Commits
ec2fa712
Commit
ec2fa712
authored
1 year ago
by
Mikkel Friis-Møller
Browse files
Options
Downloads
Patches
Plain Diff
change the way wisdem is installed to allow for upload to pypi
parent
142aa78c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!70
change the way wisdem is installed to allow for upload to pypi
Pipeline
#44573
failed
1 year ago
Stage: test
Stage: deploy
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+1
-1
1 addition, 1 deletion
.gitlab-ci.yml
hydesign/__init__.py
+2
-2
2 additions, 2 deletions
hydesign/__init__.py
setup.py
+12
-1
12 additions, 1 deletion
setup.py
with
15 additions
and
4 deletions
.gitlab-ci.yml
+
1
−
1
View file @
ec2fa712
...
...
@@ -5,7 +5,7 @@ test_hydesign:
stage
:
test
script
:
-
pip install
-e
.[test]
-
pip install .[test]
-
python -m pytest
tags
:
-
linux
...
...
This diff is collapsed.
Click to expand it.
hydesign/__init__.py
+
2
−
2
View file @
ec2fa712
# 'filled_by_setup.py'
__version__
=
'
1.
0.3
'
__release__
=
'
1.
0.3
'
__version__
=
'
1.
1.0
'
__release__
=
'
1.
1.0
'
This diff is collapsed.
Click to expand it.
setup.py
+
12
−
1
View file @
ec2fa712
...
...
@@ -5,6 +5,8 @@ Setup file for hydesign
import
os
from
setuptools
import
setup
,
find_packages
import
pkg_resources
from
setuptools.command.install
import
install
from
subprocess
import
call
repo
=
os
.
path
.
dirname
(
__file__
)
try
:
...
...
@@ -23,6 +25,14 @@ except ImportError:
def
read_md
(
f
):
return
open
(
f
,
'
r
'
).
read
()
class
CustomInstallCommand
(
install
):
def
run
(
self
):
install
.
run
(
self
)
call
([
'
pip
'
,
'
install
'
,
'
wisdem
'
,
'
--no-deps
'
])
# install wisdem without dependencies as we only need CSM
import
importlib
with
open
(
importlib
.
util
.
find_spec
(
'
wisdem
'
).
origin
,
'
w
'
)
as
f
:
f
.
write
(
''
)
# stop wisdem from running un-compiled fortran code when CSM is imported
setup
(
name
=
'
hydesign
'
,
version
=
version
,
...
...
@@ -38,6 +48,8 @@ setup(name='hydesign',
author_email
=
'
jumu@dtu.dk
'
,
license
=
'
MIT
'
,
packages
=
find_packages
(),
cmdclass
=
{
'
install
'
:
CustomInstallCommand
},
package_data
=
{
'
hydesign
'
:
[
'
tests/test_files/sm.pkl
'
,
...
...
@@ -69,7 +81,6 @@ setup(name='hydesign',
'
statsmodels
'
,
'
rainflow
'
,
'
pyyaml
'
,
'
wisdem @ git+https://github.com/DTUWindEnergy/WISDEM.git@csm_only
'
,
'
matplotlib
'
,
'
zarr
'
,
],
...
...
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