Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
E
ellipsyswrapper
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
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
EllipSys
ellipsyswrapper
Commits
57d31b7e
Commit
57d31b7e
authored
6 months ago
by
Frederik Zahle
Browse files
Options
Downloads
Plain Diff
Merge branch 'bot_token' into 'master'
Bot token See merge request
!20
parents
c42687f9
ef6912f1
No related branches found
No related tags found
1 merge request
!20
Bot token
Pipeline
#60654
passed
6 months ago
Stage: test
Changes
4
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitlab-ci.yml
+9
-3
9 additions, 3 deletions
.gitlab-ci.yml
ellipsyswrapper/testsuite.py
+4
-0
4 additions, 0 deletions
ellipsyswrapper/testsuite.py
pyproject.toml
+40
-0
40 additions, 0 deletions
pyproject.toml
setup.py
+0
-19
0 additions, 19 deletions
setup.py
with
53 additions
and
22 deletions
.gitlab-ci.yml
+
9
−
3
View file @
57d31b7e
image
:
frza/gitlab-ci-debian:gcc73-openmpi311
image
:
quay.io/pypa/manylinux_2_28_x86_64:latest
test37
:
test37
:
tags
:
-
docker
-
linux
script
:
script
:
-
source activate py37
-
python3.11 -m venv build_env
-
source build_env/bin/activate
-
python -m pip install --upgrade pip
-
pip install pytest
-
pip install -e .
-
pip install -e .
-
nose
test
s
-
py
test
This diff is collapsed.
Click to expand it.
ellipsyswrapper/testsuite.py
+
4
−
0
View file @
57d31b7e
...
@@ -130,6 +130,7 @@ class CaseRunner(object):
...
@@ -130,6 +130,7 @@ class CaseRunner(object):
subprocess
.
check_output
(
'
git checkout -b %s
'
%
self
.
make_test_data_branch
,
shell
=
True
)
subprocess
.
check_output
(
'
git checkout -b %s
'
%
self
.
make_test_data_branch
,
shell
=
True
)
else
:
else
:
print
(
'
branch %s exists, switching to it
'
%
self
.
make_test_data_branch
,
flush
=
True
)
print
(
'
branch %s exists, switching to it
'
%
self
.
make_test_data_branch
,
flush
=
True
)
subprocess
.
check_output
(
'
git fetch origin
'
,
shell
=
True
)
subprocess
.
check_output
(
'
git checkout %s
'
%
(
self
.
make_test_data_branch
),
shell
=
True
)
subprocess
.
check_output
(
'
git checkout %s
'
%
(
self
.
make_test_data_branch
),
shell
=
True
)
if
os
.
environ
.
get
(
'
CI_JOB_ID
'
,
None
)
is
not
None
:
if
os
.
environ
.
get
(
'
CI_JOB_ID
'
,
None
)
is
not
None
:
subprocess
.
check_output
(
'
git config user.email
"
%s
"'
%
'
ellipsys_ci_bot@dtu.dk
'
,
shell
=
True
)
subprocess
.
check_output
(
'
git config user.email
"
%s
"'
%
'
ellipsys_ci_bot@dtu.dk
'
,
shell
=
True
)
...
@@ -161,6 +162,9 @@ class CaseRunner(object):
...
@@ -161,6 +162,9 @@ class CaseRunner(object):
url2
=
'
%s//ellipsys_ci_bot:%s@%s
'
%
(
parts
[
0
],
bot_token
,
parts
[
1
])
url2
=
'
%s//ellipsys_ci_bot:%s@%s
'
%
(
parts
[
0
],
bot_token
,
parts
[
1
])
if
"
ellipsys_ci_bot
"
not
in
url
:
if
"
ellipsys_ci_bot
"
not
in
url
:
os
.
system
(
'
git remote set-url origin %s
'
%
url2
)
os
.
system
(
'
git remote set-url origin %s
'
%
url2
)
command
=
'
git pull origin %s
'
%
self
.
make_test_data_branch
print
(
'
checking remote branch %s for updates
'
%
self
.
make_test_data_branch
,
flush
=
True
)
status
=
subprocess
.
check_output
(
command
,
shell
=
True
)
command
=
'
git push origin %s
'
%
self
.
make_test_data_branch
command
=
'
git push origin %s
'
%
self
.
make_test_data_branch
print
(
'
pushing code with ellipsys_ci_bot user
'
,
flush
=
True
)
print
(
'
pushing code with ellipsys_ci_bot user
'
,
flush
=
True
)
status
=
subprocess
.
check_output
(
command
,
shell
=
True
)
status
=
subprocess
.
check_output
(
command
,
shell
=
True
)
...
...
This diff is collapsed.
Click to expand it.
pyproject.toml
0 → 100644
+
40
−
0
View file @
57d31b7e
[build-system]
requires
=
[
"setuptools>
=
61
",
"setuptools-scm>
=
8.0
"]
build-backend
=
"setuptools.build_meta"
[
project
]
name
=
"ellipsyswrapper"
authors
=
[
{name
=
"Department of Wind and Energy Systems, DTU"
}
,
]
maintainers
=
[
{
name
=
"Frederik Zahle"
,
email
=
"frza@dtu.dk"
}
,
{
name
=
"Paul van der Laan"
,
email
=
"plaa@dtu.dk"
}
,
]
description
=
"Python tools used for regression testing of EllipSys"
readme
=
"README.md"
requires-python
=
">
=
3.7
"
classifiers
=
[
"Programming Language :: Python :: 3"
,
"Operating System :: POSIX :: Linux"
]
dependencies
=
[
"pytest"
,
"numpy"
]
dynamic
=
[
"version"
]
[
tool.setuptools
]
packages
=
[
"ellipsyswrapper"
,
]
[
tool.setuptools.package-data
]
ellipsys3d
=
[
"test/outputs_data3d"
,
]
[
tool.setuptools_scm
]
version_file
=
"ellipsyswrapper/version.py"
This diff is collapsed.
Click to expand it.
setup.py
deleted
100644 → 0
+
0
−
19
View file @
c42687f9
from
setuptools
import
setup
,
find_packages
kwargs
=
{
'
author
'
:
''
,
'
author_email
'
:
''
,
'
description
'
:
''
,
'
download_url
'
:
''
,
'
include_package_data
'
:
True
,
'
install_requires
'
:
[],
'
keywords
'
:
[],
'
license
'
:
''
,
'
maintainer
'
:
''
,
'
maintainer_email
'
:
''
,
'
name
'
:
'
ellipsyswrapper
'
,
'
packages
'
:
[
'
ellipsyswrapper
'
],
'
version
'
:
'
0.1
'
,
'
zip_safe
'
:
False
}
setup
(
**
kwargs
)
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