Skip to content

Commit

Permalink
Merge pull request #251 from stringertheory/dev
Browse files Browse the repository at this point in the history
get ci working
  • Loading branch information
stringertheory committed Feb 3, 2024
2 parents 80ed949 + e466f21 commit 20cb385
Show file tree
Hide file tree
Showing 11 changed files with 338 additions and 101 deletions.
57 changes: 0 additions & 57 deletions .circleci/config.yml

This file was deleted.

3 changes: 0 additions & 3 deletions .coveragerc

This file was deleted.

7 changes: 4 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.8", "3.9", "3.10", "3.11"]
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
fail-fast: false
steps:
- name: Check out
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:

- name: Upload coverage reports to Codecov with GitHub Action on Python 3.11
uses: codecov/codecov-action@v3
if: ${{ matrix.python-version == '3.11' }}
if: ${{ matrix.python-version == '3.12' }}

check-docs:
runs-on: ubuntu-latest
Expand All @@ -71,4 +71,5 @@ jobs:
uses: ./.github/actions/setup-poetry-env

- name: Check if documentation can be built
run: poetry run mkdocs build -s
# run: poetry run mkdocs build -s
run: poetry run sphinx-build docs docs/_build/html
3 changes: 0 additions & 3 deletions .pyup.yml

This file was deleted.

7 changes: 0 additions & 7 deletions MANIFEST.in

This file was deleted.

3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ build-and-publish: build publish ## Build and publish.

.PHONY: docs-test
docs-test: ## Test if documentation can be built without warnings or errors
@poetry run mkdocs build -s
# @poetry run mkdocs build -s
@poetry run sphinx-build docs docs/_build/html

.PHONY: docs
docs: ## Build and serve the documentation
Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@
# The version info for the project you're documenting, acts as
# replacement for |version| and |release|, also used in various other
# places throughout the built documents. The short X.Y version:
version = "0.6.0"
version = "0.6.1"
# The full version, including alpha/beta/rc tags:
release = "0.6.0"
release = "0.6.1"

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
303 changes: 302 additions & 1 deletion poetry.lock

Large diffs are not rendered by default.

28 changes: 27 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "traces"
version = "0.0.1"
version = "0.6.1"
description = "A Python library for unevenly-spaced time series analysis"
authors = ["Mike Stringer <mike.stringer.internet@gmail.com>"]
repository = "https://github.com/stringertheory/traces"
Expand Down Expand Up @@ -42,6 +42,7 @@ matplotlib = [
]
pytest-mpl = "^0.16.1"
pyarrow = "^15.0.0"
bump-my-version = "^0.17.3"

[tool.poetry.group.docs.dependencies]
mkdocs = "^1.4.2"
Expand All @@ -54,6 +55,31 @@ sphinx = [
sphinx-autobuild = "^2021.3.14"
recommonmark = "^0.7.1"

[tool.bumpversion]
current_version = "0.6.1"
parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
serialize = ["{major}.{minor}.{patch}"]
search = "{current_version}"
replace = "{new_version}"
regex = false
ignore_missing_version = false
tag = false
sign_tags = false
tag_name = "v{new_version}"
tag_message = "Bump version: {current_version} → {new_version}"
allow_dirty = true
commit = false
message = "Bump version: {current_version} → {new_version}"
commit_args = "--no-verify"

[[tool.bumpversion.files]]
filename = "pyproject.toml"

[[tool.bumpversion.files]]
filename = "traces/__init__.py"

[[tool.bumpversion.files]]
filename = "docs/conf.py"

[build-system]
requires = ["poetry-core>=1.0.0"]
Expand Down
22 changes: 0 additions & 22 deletions setup.cfg

This file was deleted.

2 changes: 1 addition & 1 deletion traces/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@

__author__ = "Mike Stringer"
__email__ = "mike.stringer@datascopeanalytics.com"
__version__ = "0.6.0"
__version__ = "0.6.1"

0 comments on commit 20cb385

Please sign in to comment.