Skip to content

Commit

Permalink
Rip out appveyor.
Browse files Browse the repository at this point in the history
  • Loading branch information
icemac committed Mar 22, 2024
1 parent f33185d commit 32bb1a7
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 204 deletions.
77 changes: 0 additions & 77 deletions config/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,6 @@ The following options are only needed one time as their values are stored in
Define the configuration type (see `Types`_ section above) to be used for the
repository.

--with-appveyor
Enable running the tests on AppVeyor, too.

--with-macos
Enable running the tests on macOS on GitHub Actions.

Expand Down Expand Up @@ -204,7 +201,6 @@ updated. Example:
commit-id = "< commit-hash >"
[python]
with-appveyor = false
with-pypy = false
with-docs = true
with-sphinx-doctests = false
Expand Down Expand Up @@ -328,36 +324,6 @@ updated. Example:
"tox -f ${{ matrix.config[1] }}",
]
[appveyor]
global-env-vars = [
"ZOPE_INTERFACE_STRICT_IRO: 1",
]
additional-matrix = [
"- { PYTHON: 38, PURE_PYTHON: 1 }",
"- { PYTHON: 38-x64, PURE_PYTHON: 1 }",
]
install-steps = [
"- pip install zc.buildout",
"- buildout",
]
build-script = [
"- python -W ignore setup.py -q bdist_wheel",
]
test-steps = [
"- zope-testrunner --test-path=src",
"- jasmine",
]
additional-lines = [
"artifacts:",
" - path: 'dist\*.whl'",
" name: wheel",
]
replacement = [
"environment:",
" matrix:",
" ...",
]
[c-code]
manylinux-install-setup = [
"export CFLAGS=\"-pipe\"",
Expand Down Expand Up @@ -402,9 +368,6 @@ commit-id
Python options
``````````````

with-appveyor
Run the tests also on AppVeyor: true/false

with-macos
Run the tests also on macOS on GitHub Actions: true/false, default: false

Expand Down Expand Up @@ -636,46 +599,6 @@ test-commands
This option has to be a list of strings.


AppVeyor options
````````````````

The corresponding section is named: ``[appveyor]``.

global-env-vars
Environment variables to specify globally. This option has to be a list of
strings.

additional-matrix
Additional environment matrix rows. This option has to be a list of strings,
each starting with a ``-`` (unless you know what you're doing).

install-steps
Steps to install the package under test on AppVeyor. This option has to be a
list of strings. It defaults to ``["- pip install -U -e .[test]"]``.

build-script
Steps to to build the project. If this option is not given because no
additional build steps are necessary ``build: false`` is rendered to the
AppVeyor configuration. But if the config type is ``c-code`` it defaults to
``['- python -W ignore setup.py -q bdist_wheel']``. This option has to be a
list of strings, each one starting with a ``-``.

test-steps
Steps to run the tests on AppVeyor. This option has to be a list of strings
, each one starting with a ``-``. It defaults to
``["- zope-testrunner --test-path=src"]``.

additional-lines
This option allows to add arbitrary additional lines to the end of the
configuration file. It has to be a list of strings.

replacement
Replace the whole template of the AppVeyor configuration with the contents of
this option. Use this option as last resort if your needed changes are too
big to configure AppVeyor in another way. This option has to be a list of
strings.


C-code options
``````````````

Expand Down
8 changes: 0 additions & 8 deletions config/c-code/appveyor-publish.j2

This file was deleted.

55 changes: 3 additions & 52 deletions config/config-package.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,6 @@ def handle_command_line_arguments():
action='store_false',
default=True,
help='Do not include flake8 and isort in the linting configuration.')
parser.add_argument(
'--with-appveyor',
dest='with_appveyor',
action='store_true',
default=False,
help='Activate running tests on AppVeyor, too, '
'if not already configured in .meta.toml.')
parser.add_argument(
'--with-macos',
dest='with_macos',
Expand Down Expand Up @@ -185,10 +178,6 @@ def _read_meta_configuration(self):
if self.args.with_docs is None:
self.args.with_docs = (self.path / "docs" / "conf.py").exists()
print(f"Autodetecting --with-docs: {self.args.with_docs}")
if self.args.with_appveyor is None:
value = (self.path / "appveyor.yml").exists()
self.args.with_appveyor = value
print(f"Autodetecting --with-appveyor: {value}")
return meta_cfg

@cached_property
Expand Down Expand Up @@ -220,10 +209,6 @@ def jinja_env(self):
lstrip_blocks=True,
)

@cached_property
def with_appveyor(self):
return self._set_python_config_value('appveyor')

@cached_property
def with_macos(self):
return self._set_python_config_value('macos')
Expand Down Expand Up @@ -530,38 +515,7 @@ def manifest_in(self):
self.copy_with_meta(
'MANIFEST.in.j2', self.path / 'MANIFEST.in', self.config_type,
additional_rules=additional_manifest_rules,
with_docs=self.with_docs, with_appveyor=self.with_appveyor)

def appveyor(self):
appveyor_global_env_vars = self.meta_cfg['appveyor'].get(
'global-env-vars', [])
appveyor_additional_matrix = self.meta_cfg['appveyor'].get(
'additional-matrix', [])
appveyor_install_steps = self.meta_cfg['appveyor'].get(
'install-steps', ['- pip install -U -e .[test]'])
appveyor_build_script = self.meta_cfg['appveyor'].get(
'build-script', [])
if self.config_type == 'c-code' and not appveyor_build_script:
appveyor_build_script = [
'- python -W ignore setup.py -q bdist_wheel']
appveyor_test_steps = self.meta_cfg['appveyor'].get(
'test-steps', ['- zope-testrunner --test-path=src'])
appveyor_additional_lines = self.meta_cfg['appveyor'].get(
'additional-lines', [])
appveyor_replacement = self.meta_cfg['appveyor'].get('replacement', [])
self.copy_with_meta(
'appveyor.yml.j2',
self.path / 'appveyor.yml',
self.config_type,
with_future_python=self.with_future_python,
global_env_vars=appveyor_global_env_vars,
additional_matrix=appveyor_additional_matrix,
install_steps=appveyor_install_steps,
test_steps=appveyor_test_steps,
build_script=appveyor_build_script,
additional_lines=appveyor_additional_lines,
replacement=appveyor_replacement,
)
with_docs=self.with_docs)

def copy_with_meta(
self, template_name, destination, config_type,
Expand Down Expand Up @@ -613,9 +567,6 @@ def configure(self):
self.tests_yml()
self.manifest_in()

if self.with_appveyor:
self.appveyor()

with change_dir(self.path) as cwd:
if pathlib.Path('bootstrap.py').exists():
call('git', 'rm', 'bootstrap.py')
Expand All @@ -625,8 +576,8 @@ def configure(self):
call('git', 'rm', '.coveragerc')
if self.add_coveragerc and self.args.commit:
call('git', 'add', '.coveragerc')
if self.with_appveyor and self.args.commit:
call('git', 'add', 'appveyor.yml')
if pathlib.Path('appveyor.yml').exists():
call('git', 'rm', 'appveyor.yml')
if self.with_docs and self.args.commit:
call('git', 'add', '.readthedocs.yaml')
if self.add_manylinux and self.args.commit:
Expand Down
3 changes: 0 additions & 3 deletions config/default/MANIFEST.in.j2
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ include *.rst
include *.txt
include buildout.cfg
include tox.ini
{% if with_appveyor %}
include appveyor.yml
{% endif %}
{% if config_type in ('buildout-recipe', 'c-code') %}
include .coveragerc
{% endif %}
Expand Down
64 changes: 0 additions & 64 deletions config/default/appveyor.yml.j2

This file was deleted.

0 comments on commit 32bb1a7

Please sign in to comment.