Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Fix OS #1

Merged
merged 22 commits into from
Nov 11, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .codespellrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
[codespell]
skip = .git/*
skip = .git/*,*.pdf
ignore-words-list = INH
6 changes: 3 additions & 3 deletions .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Changes here will be overwritten by Copier

_commit: 0.1.65
_commit: 0.1.67
_src_path: [email protected]:neuromath/python-template.git
author_email: ''
author_name: Blue Brain Project, EPFL
Expand All @@ -9,11 +9,11 @@ copyright_year: '2022'
distribution_name: synthesis-workflow
download_url: https://github.com/BlueBrain/synthesis-workflow
init_git: false
maintainer: Adrien Berchet
maintainer: Adrien Berchet (@adrien-berchet)
package_name: synthesis_workflow
project_description: Workflow used for synthesis and its validation.
project_name: Synthesis Workflow
project_url: https://synthesis_workflow.readthedocs.io
project_url: https://synthesis-workflow.readthedocs.io
repository_name: synthesis-workflow
repository_namespace: BlueBrain
repository_provider: github
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Your reports must include the following features:
- type: input
id: relevant_documentation
attributes:
label: Optional link from https://synthesis_workflow.readthedocs.io which documents the behavior that is expected
label: Optional link from https://synthesis-workflow.readthedocs.io which documents the behavior that is expected
description: "
Please make sure the behavior you are seeing is definitely in contradiction to what's documented as the correct behavior.
"
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ body:
Thanks for taking the time to fill out this feature request!


Before submitting, make sure the feature does not already exist in the [documentation](https://synthesis_workflow.readthedocs.io) and that you searched in the [issue list](https://github.com/BlueBrain/synthesis-workflow/issues) that a similar feature request has not already been reported.
Before submitting, make sure the feature does not already exist in the [documentation](https://synthesis-workflow.readthedocs.io) and that you searched in the [issue list](https://github.com/BlueBrain/synthesis-workflow/issues) that a similar feature request has not already been reported.
If it is not the case, please read the following guidelines.

### GUIDELINES FOR REQUESTING HELP
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/how_to_use.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ body:
Thanks for using this package and taking the time to fill out this help request!


Before submitting, make sure you read the [documentation](https://synthesis_workflow.readthedocs.io) carefully.
Before submitting, make sure you read the [documentation](https://synthesis-workflow.readthedocs.io) carefully.
If you still have a question, you should search in the [issue list](https://github.com/BlueBrain/synthesis-workflow/issues) that a similar issue has not already been reported, you might find your answer there.
If it is not the case, please read the following guidelines.

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run-tox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
pip install tox
tox run -e min_versions
- name: JUnit Report Action
uses: mikepenz/action-junit-report@v4
uses: mikepenz/action-junit-report@v5
if: always() # always run even if the previous step fails
with:
report_paths: 'reports/pytest-*.xml'
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v5.0.0
hooks:
- id: check-added-large-files
- id: check-case-conflict
Expand All @@ -11,7 +11,7 @@ repos:
- id: end-of-file-fixer
- id: trailing-whitespace
- repo: https://github.com/alessandrojcm/commitlint-pre-commit-hook
rev: v9.17.0
rev: v9.18.0
hooks:
- id: commitlint
stages:
Expand All @@ -22,7 +22,7 @@ repos:
hooks:
- id: isort
- repo: https://github.com/psf/black
rev: 24.8.0
rev: 24.10.0
hooks:
- id: black
- repo: https://github.com/codespell-project/codespell
Expand Down
4 changes: 1 addition & 3 deletions .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,4 @@ ignore-docstrings=yes
[TYPECHECK]
# List of classes names for which member attributes should not be checked
# (useful for classes with attributes dynamically set).

# as of numpy 1.8.0, name resolution seems to be a problem. Ignore lookups in numpy
# ignored-classes=numpy,list
extension-pkg-allow-list=lxml.etree
2 changes: 1 addition & 1 deletion AUTHORS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Maintainer

Adrien Berchet
Adrien Berchet (@adrien-berchet)

# Contributors
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ When you wish to contribute to the code base, please consider the following guid
or

```shell
tox -e py39 -e lint -e docs -e check-packaging
tox run -e py39,lint,docs,check-packaging
```

* Commit your changes using a descriptive commit message.
Expand Down
2 changes: 1 addition & 1 deletion docs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ help:
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

clean:
@rm -rf $(BUILDDIR) $(SOURCEDIR)/examples $(SOURCEDIR)/generated
@rm -rf $(BUILDDIR) $(SOURCEDIR)/examples $(SOURCEDIR)/autoapi
9 changes: 5 additions & 4 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,11 @@

# -- Project information -----------------------------------------------------

project = "Synthesis Workflow"
project_name = "Synthesis Workflow"
package_name = "synthesis-workflow"

# The short X.Y version
version = metadata.version("synthesis-workflow")
version = metadata.version(package_name)

# The full version, including alpha/beta/rc tags
release = version
Expand Down Expand Up @@ -94,10 +95,10 @@
# html_static_path = ['_static']

html_theme_options = {
"metadata_distribution": "synthesis-workflow",
"metadata_distribution": package_name,
}

html_title = project
html_title = project_name

# If true, links to the reST sources are added to the pages.
html_show_sourcelink = False
Expand Down
1 change: 1 addition & 0 deletions docs/source/contributing.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.. mdinclude:: ../../CONTRIBUTING.md
1 change: 1 addition & 0 deletions docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,4 @@ The :doc:`./api_ref` page contains detailed documentation of:
cli
api_ref
changelog
contributing
6 changes: 3 additions & 3 deletions docs/source/synthesis_methodology.rst
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,6 @@ Here is an example of such ``context_constraints`` entry:

More details on the models can be found here:

* `TNS <https://bbpteam.epfl.ch/documentation/projects/TNS/latest/index.html>`_
* <region-grower doc URL> (does not exist yet)
* <placement-algorithm.app.synthesis doc URL> (does not exist yet)
* `NeuroTS <https://neurots.readthedocs.io/en/stable>`_
* `region-grower <https://region-grower.readthedocs.io/en/stable/>`_
* `placement-algorithm <https://github.com/BlueBrain/placement-algorithm>`_
3 changes: 1 addition & 2 deletions requirements/base.pip
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,8 @@ neurom>=3.2.2,<4
neurots>=3.6,<4
numpy>=1.26.4
pandas>=1.5.3
placement_algorithm>=2.3.1
PyYAML>=6
region_grower>=1.3,<2
region_grower>=1.5.1,<2
scipy>=1.10
seaborn>=0.12.2
tmd>=2.3
Expand Down
26 changes: 10 additions & 16 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,19 +1,10 @@
"""Setup for the synthesis-workflow package."""

import importlib
from pathlib import Path

from setuptools import find_namespace_packages
from setuptools import setup

spec = importlib.util.spec_from_file_location(
"src.version",
"src/version.py",
)
module = importlib.util.module_from_spec(spec)
spec.loader.exec_module(module)
VERSION = module.VERSION

# Read the requirements
with open("requirements/base.pip", "r", encoding="utf-8") as f:
reqs = f.read().splitlines()
Expand All @@ -28,21 +19,23 @@

setup(
name="synthesis-workflow",
author="bbp-ou-cells",
author_email="[email protected]",
author="Blue Brain Project, EPFL",
description="Workflow used for synthesis and its validation.",
long_description=Path("README.rst").read_text(encoding="utf-8"),
long_description_content_type="text/x-rst",
url="https://bbpteam.epfl.ch/documentation/projects/synthesis-workflow",
url="https://synthesis-workflow.readthedocs.io",
project_urls={
"Tracker": "https://bbpteam.epfl.ch/project/issues/projects/CELLS/issues",
"Source": "https://bbpgitlab.epfl.ch/neuromath/synthesis-workflow",
"Tracker": "https://github.com/BlueBrain/synthesis-workflow/issues",
"Source": "https://github.com/BlueBrain/synthesis-workflow",
},
license="BBP-internal-confidential",
license="Apache License 2.0",
packages=find_namespace_packages("src"),
package_dir={"": "src"},
python_requires=">=3.9",
version=VERSION,
use_scm_version=True,
setup_requires=[
"setuptools_scm",
],
install_requires=reqs,
extras_require={
"docs": doc_reqs,
Expand All @@ -56,6 +49,7 @@
},
include_package_data=True,
classifiers=[
# TODO: Update to relevant classifiers
"Development Status :: 2 - Pre-Alpha",
"Intended Audience :: Education",
"Intended Audience :: Science/Research",
Expand Down
3 changes: 0 additions & 3 deletions src/synthesis_workflow/morphology_combos/__init__.py

This file was deleted.

150 changes: 0 additions & 150 deletions src/synthesis_workflow/morphology_combos/create_me_combos.py

This file was deleted.

Loading
Loading