Browse Source

Version bump; switch from master+develop to main

tags/v0.6.5
Ben Kurtovic 2 years ago
parent
commit
6665505251
8 changed files with 33 additions and 22 deletions
  1. +0
    -4
      .github/workflows/build-wheels.yml
  2. +1
    -0
      .travis.yml
  3. +4
    -0
      CHANGELOG
  4. +2
    -2
      README.rst
  5. +12
    -6
      appveyor.yml
  6. +8
    -0
      docs/changelog.rst
  7. +3
    -7
      scripts/release.sh
  8. +3
    -3
      src/mwparserfromhell/__init__.py

+ 0
- 4
.github/workflows/build-wheels.yml View File

@@ -9,10 +9,6 @@ jobs:
- uses: actions/checkout@v2
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
- name: Build manylinux1 x86-64 wheels
uses: earwig/python-wheels-manylinux-build@latest-manylinux1_x86_64
with:
python-versions: 'cp36-cp36m cp37-cp37m cp38-cp38 cp39-cp39'
- name: Build manylinux2014 x86-64 wheels
uses: earwig/python-wheels-manylinux-build@latest-manylinux2014_x86_64
with:


+ 1
- 0
.travis.yml View File

@@ -5,6 +5,7 @@ python:
- 3.7
- 3.8
- 3.9
- 3.10
arch:
- amd64
- ppc64le


+ 4
- 0
CHANGELOG View File

@@ -1,3 +1,7 @@
v0.7 (unreleased):

- ...

v0.6.4 (released February 14, 2022):

- Dropped support for end-of-life Python 3.5.


+ 2
- 2
README.rst View File

@@ -1,11 +1,11 @@
mwparserfromhell
================

.. image:: https://api.travis-ci.com/earwig/mwparserfromhell.svg?branch=develop
.. image:: https://api.travis-ci.com/earwig/mwparserfromhell.svg
:alt: Build Status
:target: https://travis-ci.org/earwig/mwparserfromhell

.. image:: https://img.shields.io/coveralls/earwig/mwparserfromhell/develop.svg
.. image:: https://img.shields.io/coveralls/earwig/mwparserfromhell/main.svg
:alt: Coverage Status
:target: https://coveralls.io/r/earwig/mwparserfromhell



+ 12
- 6
appveyor.yml View File

@@ -1,13 +1,11 @@
# This config file is used by appveyor.com to build Windows release binaries

version: 0.6.4-b{build}
version: 0.7.dev0-b{build}

branches:
only:
- master
- develop

skip_tags: true
- main
- /v\d+(\.\d+)*/

image: Visual Studio 2019

@@ -56,6 +54,14 @@ environment:
PYTHON_VERSION: "3.9"
PYTHON_ARCH: "64"

- PYTHON: "C:\\Python310"
PYTHON_VERSION: "3.10"
PYTHON_ARCH: "32"

- PYTHON: "C:\\Python310-x64"
PYTHON_VERSION: "3.10"
PYTHON_ARCH: "64"

install:
- "%PIP% install --disable-pip-version-check --user --upgrade pip"
- "%PIP% install wheel twine pytest"
@@ -71,7 +77,7 @@ after_test:
- "%SETUPPY% bdist_wheel"

on_success:
- "IF %APPVEYOR_REPO_BRANCH%==master %TWINE% upload dist\\* -u %PYPI_USERNAME% -p %PYPI_PASSWORD%"
- "IF %APPVEYOR_REPO_TAG%==true %TWINE% upload dist\\* -u %PYPI_USERNAME% -p %PYPI_PASSWORD%"

artifacts:
- path: dist\*


+ 8
- 0
docs/changelog.rst View File

@@ -1,6 +1,14 @@
Changelog
=========

v0.7
----

Unreleased
(`changes <https://github.com/earwig/mwparserfromhell/compare/v0.6.4...main>`__):

- ...

v0.6.4
------



+ 3
- 7
scripts/release.sh View File

@@ -16,8 +16,8 @@ check_git() {
echo "Aborting: dirty working directory."
exit 1
fi
if [[ "$(git rev-parse --abbrev-ref HEAD)" != "develop" ]]; then
echo "Aborting: not on develop."
if [[ "$(git rev-parse --abbrev-ref HEAD)" != "main" ]]; then
echo "Aborting: not on main."
exit 1
fi
echo -n "Are you absolutely ready to release? [yN] "
@@ -66,12 +66,8 @@ do_git_stuff() {
echo -n "Git: committing, tagging, and merging release..."
git commit -qam "release/$VERSION"
git tag v$VERSION -s -m "version $VERSION"
git checkout -q master
git merge -q --no-ff develop -m "Merge develop into master (release/$VERSION)"
echo -n " pushing..."
git push -q --tags origin master
git checkout -q develop
git push -q origin develop
git push -q --tags origin main
echo " done."
}



+ 3
- 3
src/mwparserfromhell/__init__.py View File

@@ -1,4 +1,4 @@
# Copyright (C) 2012-2021 Ben Kurtovic <ben.kurtovic@gmail.com>
# Copyright (C) 2012-2022 Ben Kurtovic <ben.kurtovic@gmail.com>
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
@@ -25,9 +25,9 @@ outrageously powerful parser for `MediaWiki <https://www.mediawiki.org>`_ wikico
"""

__author__ = "Ben Kurtovic"
__copyright__ = "Copyright (C) 2012-2021 Ben Kurtovic"
__copyright__ = "Copyright (C) 2012-2022 Ben Kurtovic"
__license__ = "MIT License"
__version__ = "0.6.4"
__version__ = "0.7.dev0"
__email__ = "ben.kurtovic@gmail.com"

from . import definitions, nodes, parser, smart_list, string_mixin, utils, wikicode


Loading…
Cancel
Save