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

Adapt to removal of dev branch #290

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all 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
1 change: 1 addition & 0 deletions .github/workflows/branch-checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
python-version: [3.9]
uses: ./.github/workflows/_run_tests.yml
with:
python-version: ${{ matrix.python-version }}
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/pip_installation.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
# Perform pip installation and run all tests

# For feature branches, we don't test the full matrix (os x [stable, loose]) in order to save time & resources.
# On each push to develop, the whole test matrix runs, additionally, its success is mandatory for merging to main.
# On each push to main, the whole test matrix runs.
# In the (assumed to be rare case) that these full matrix tests fail but the reduced matrix tests passed,
# we will learn about it latest before pushing to main. The merge that caused the issue can then be identified
# from the tests that ran on develop.
# we will learn about it latest after pushing to main. The merge that caused the issue can then be identified.
on:
push:
branches: [ main, development ]
pull_request:
branches: [ main ]
workflow_dispatch:

Expand All @@ -20,6 +17,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macOS-latest, windows-latest, macos-latest-xlarge]
python-version : [3.9]
uses: ./.github/workflows/_run_tests.yml
with:
os: ${{ matrix.os }}
Expand Down
3 changes: 0 additions & 3 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ sphinx:
# Optionally build your docs in additional formats such as PDF
# formats: all

# conda:
# environment: misc/conda_dev_env.yaml

# # Optionally set the version of Python and requirements required to build your docs
python:
install:
Expand Down
201 changes: 0 additions & 201 deletions LICENSE

This file was deleted.

7 changes: 6 additions & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
recursive-include alphabase *
include LICENSE.txt
include README.md
recursive-exclude alphabase/logs *

recursive-exclude logs *
recursive-exclude tests *

global-exclude */__pycache__/*
global-exclude *.pyc *.nbi *.nbc
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,11 @@ NOTE: You might need to run `pip install -U pip` before installing
AlphaBase like this. Also note the double quotes `"`.

For those who are really adventurous, it is also possible to directly
install any branch (e.g. `@development`) with any extras
install any branch (e.g. `@main`) with any extras
(e.g. `#egg=alphabase[stable,development]`) from GitHub with e.g.

``` bash
pip install "git+https://github.com/MannLabs/alphabase.git@development#egg=alphabase[stable,development]"
pip install "git+https://github.com/MannLabs/alphabase.git@main#egg=alphabase[stable,development]"
```

### Developer
Expand Down
2 changes: 0 additions & 2 deletions alphabase/cli.py

This file was deleted.

2 changes: 0 additions & 2 deletions alphabase/gui.py

This file was deleted.

11 changes: 0 additions & 11 deletions docs/build_docs.sh

This file was deleted.

13 changes: 0 additions & 13 deletions misc/checklist.txt

This file was deleted.

6 changes: 0 additions & 6 deletions misc/conda_dev_env.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion misc/pip_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ conda run -n $ENV_NAME --no-capture-output pip freeze

# conda 'run' vs. 'activate', cf. https://stackoverflow.com/a/72395091
conda run -n $ENV_NAME --no-capture-output pip install -e "../.$INSTALL_STRING"
conda run -n $ENV_NAME --no-capture-output alphabase
conda run -n $ENV_NAME --no-capture-output python -c "import alphabase; print('OK')" -v
14 changes: 7 additions & 7 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@ find = {}
[tool.setuptools.dynamic]
# https://stackoverflow.com/a/73600610
dependencies = {file = ["requirements/requirements_loose.txt"]}
optional-dependencies = { stable = { file = ["requirements/requirements.txt",
] }, tests = { file = [ "requirements/requirements_tests.txt",
] }, development = { file = ["requirements/requirements_development.txt", "requirements/requirements_tests.txt", "requirements/requirements_docs.txt"
] }}
optional-dependencies.stable = { file = ["requirements/requirements.txt"] }
optional-dependencies.tests = { file = [ "requirements/requirements_tests.txt"] }
optional-dependencies.development = { file = [
"requirements/requirements_development.txt",
"requirements/requirements_tests.txt",
"requirements/requirements_docs.txt"
] }
version = {attr = "alphabase.__version__"}

[project.scripts]
alphabase = "alphabase.cli:run"


[tool.ruff.lint]
select = [
Expand Down
2 changes: 0 additions & 2 deletions ruff-lint-psm-readers.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ exclude = [
"test_*",
"alphabase/__init__.py",
"alphabase/*utils.py",
"alphabase/gui.py",
"alphabase/cli.py",
"alphabase/quantification/*.py",
"alphabase/smiles/*.py",
"alphabase/protein/*.py",
Expand Down
Loading