Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
ogs-feliks
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
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
Code review analytics
Issue analytics
Insights
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
Feliks Kiszkurno
ogs-feliks
Commits
d1e44ab0
Commit
d1e44ab0
authored
2 years ago
by
Lars Bilke
Browse files
Options
Downloads
Patches
Plain Diff
[wheel] Fix versioning scheme.
parent
2f3ee741
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
pyproject.toml
+0
-4
0 additions, 4 deletions
pyproject.toml
setup.py
+4
-1
4 additions, 1 deletion
setup.py
with
4 additions
and
5 deletions
pyproject.toml
+
0
−
4
View file @
d1e44ab0
...
@@ -9,10 +9,6 @@ requires = [
...
@@ -9,10 +9,6 @@ requires = [
]
]
build-backend
=
"setuptools.build_meta"
build-backend
=
"setuptools.build_meta"
[tool.setuptools_scm]
# added --abbrev=8 to force consistent length
git_describe_command
=
"git describe --dirty --tags --long --match
\"
*[0-9]*
\"
--abbrev=8"
[tool.pytest.ini_options]
[tool.pytest.ini_options]
testpaths
=
[
"Tests"
]
testpaths
=
[
"Tests"
]
norecursedirs
=
[
"Tests/Data"
]
norecursedirs
=
[
"Tests/Data"
]
...
...
This diff is collapsed.
Click to expand it.
setup.py
+
4
−
1
View file @
d1e44ab0
...
@@ -35,7 +35,7 @@ if "SETUPTOOLS_SCM_LOCAL_SCHEME" in os.environ:
...
@@ -35,7 +35,7 @@ if "SETUPTOOLS_SCM_LOCAL_SCHEME" in os.environ:
cmake_args
=
[
f
"
--preset
{
cmake_preset
}
"
,
"
-B .
"
]
cmake_args
=
[
f
"
--preset
{
cmake_preset
}
"
,
"
-B .
"
]
if
"
SKBUILD_GENERATOR
"
in
os
.
environ
:
if
"
SKBUILD_GENERATOR
"
in
os
.
environ
:
cmake_args
.
extend
([
'
-G
'
,
os
.
environ
[
"
SKBUILD_GENERATOR
"
]])
cmake_args
.
extend
([
"
-G
"
,
os
.
environ
[
"
SKBUILD_GENERATOR
"
]])
setup
(
setup
(
name
=
"
ogs
"
,
name
=
"
ogs
"
,
...
@@ -58,5 +58,8 @@ setup(
...
@@ -58,5 +58,8 @@ setup(
# This would be in line with PEP 440, switch OGS versioning too?
# This would be in line with PEP 440, switch OGS versioning too?
"
version_scheme
"
:
"
no-guess-dev
"
,
"
version_scheme
"
:
"
no-guess-dev
"
,
"
local_scheme
"
:
scm_local_scheme
,
"
local_scheme
"
:
scm_local_scheme
,
# Was in pyproject.toml but it somehow reset the version scheme. Maybe
# it is better to do all scm config here.
"
git_describe_command
"
:
'
git describe --dirty --tags --long --match
"
*[0-9]*
"
--abbrev=8
'
,
},
},
)
)
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