Skip to content

Commit

Permalink
Some housecleaning stuff (vivisect#629)
Browse files Browse the repository at this point in the history
  • Loading branch information
rakuy0 authored Oct 5, 2023
1 parent e6246ee commit 6d760a1
Show file tree
Hide file tree
Showing 8 changed files with 130 additions and 165 deletions.
43 changes: 4 additions & 39 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#
version: 2.1


commands:

do_python_setup:
Expand Down Expand Up @@ -34,12 +33,9 @@ commands:
name: checkout vivtest files repo
command: |
git clone https://github.com/vivisect/vivtestfiles.git $VIVTESTFILES
- run:
name: install deps
command: |
sudo apt-get update
sudo apt-get -qq install libfreetype6-dev liblcms2-dev ghostscript libffi-dev libjpeg-turbo-progs cmake imagemagick
sudo dpkg --add-architecture i386
sudo apt-get update
sudo apt-get -qq install libc6:i386 libncurses5:i386 libstdc++6:i386
Expand All @@ -50,26 +46,13 @@ commands:

jobs:

python38:
parallelism: 1
docker:
- image: circleci/python:3.8
environment:
VIVTESTFILES: /tmp/vivtestfiles
PYVERS: 3.8

working_directory: ~/repo

steps:
- test_steps_python

python39:
python311:
parallelism: 1
docker:
- image: circleci/python:3.9
- image: cimg/python:3.11.4
environment:
VIVTESTFILES: /tmp/vivtestfiles
PYVERS: 3.9
PYVERS: 3.11

working_directory: ~/repo

Expand All @@ -81,27 +64,9 @@ workflows:
run_tests:
jobs:

- python39:
filters:
tags:
only: /.*/
branches:
only: /.*/

- python38:
- python311:
filters:
tags:
only: /.*/
branches:
only: /.*/

# weekly:
# triggers:
# - schedule:
# cron: "0 12 1 * *"
# filters:
# branches:
# only:
# - master
# jobs:
# - python39
12 changes: 6 additions & 6 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ V1.1.1 - 2023-04-07
Features
--------
- More test resiliency for our remote server tests.
(`#584 https://github.com/vivisect/vivisect/pull/584`_)
(`#584 <https://github.com/vivisect/vivisect/pull/584>`_)
- Document ``getBranches`` API.
(`#589 https://github.com/vivisect/vivisect/pull/589`_)
(`#589 <https://github.com/vivisect/vivisect/pull/589>`_)
- Add "stepo" functionality as an option for "stepi" in VDB.
(`#591 https://github.com/vivisect/vivisect/pull/591`_)
(`#591 <https://github.com/vivisect/vivisect/pull/591>`_)
- Migrate away from some deprecated functions.
(`#593 https://github.com/vivisect/vivisect/pull/593`_)
(`#593 <https://github.com/vivisect/vivisect/pull/593>`_)
- GUI scroll improvements.
(`#599 https://github.com/vivisect/vivisect/pull/599`_)
(`#599 <https://github.com/vivisect/vivisect/pull/599>`_)
- Envi config get by string.
(`#604 https://github.com/vivisect/vivisect/pull/604`_)
(`#604 <https://github.com/vivisect/vivisect/pull/604>`_)

Fixes
-----
Expand Down
65 changes: 65 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
[build-system]
requires = ['setuptools>=68.0.0', 'wheel']
build-backend = 'setuptools.build_meta'

[project]
name = 'vivisect'
version = '1.1.1'
authors = [
{ name = 'The Vivisect Peeps', email = ''}
]
description = 'Pure python disassembler, debugger, emulator, and static analysis framework'
readme = 'README.rst'
requires-python = '>=3.11'
license = { text = 'Apache License 2.0' }
classifiers = [
'Topic :: Security',
'Topic :: Software Development :: Disassemblers',
'Topic :: Software Development :: Debuggers',
'Programming Language :: Python :: 3.11',
'License :: OSI Approved :: Apache Software License',
]

dependencies = [
'pyasn1>=0.5.0,<0.6.0',
'pyasn1-modules>=0.3.0,<0.4.0',
'cxxfilt>=0.3.0,<0.4.0',
'msgpack>=1.0.0,<1.1.0',
'pycparser>=2.20',
]

[project.urls]
Homepage = ''
Documentation = 'https://vivisect.readthedocs.io/en/latest/'
Repository = 'https://github.com/vivisect/vivisect'
Changelog = 'https://vivisect.readthedocs.io/en/latest/vivisect/changelog.html'

[project.optional-dependencies]
dev = [
'bump2version>=1.0.0,<1.1.0'
]

docs = [
'sphinx>=7.1.0,<7.2.0',
'sphinx-rtd-theme>=1.2.0,<1.3.0',
]

gui = [
# TODO: PyQT6 is out, but that's a beast that deserves its own PR.
'pyqt5==5.15.7',
'pyqtwebengine==5.15.6',
]

[project.scripts]
vivbin = 'vivisect.vivbin:main'
vdbbin = 'vdb.vdbbin:main'
vivserver = 'vivisect.remote.server:main'

[tool.setuptools]
include-package-data = true

[tool.setuptools.package-data]
'*' = ['*.dll', '*.dylib', '*.lyt', 'Makefile', '*.c', '*.h', '*.yes', '*.sh']

[tool.setuptools.packages.find]
include = ['vivisect*', 'vtrace*', 'envi*', 'PE*', 'Elf*', 'vdb*', 'visgraph*', 'vstruct*', 'vqt*', 'cobra*']
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pyasn1>=0.4.5,<0.5.0
pyasn1-modules>=0.2.4,<0.3.0
cxxfilt>=0.2.1,<0.3.0
pyasn1>=0.5.0,<0.6.0
pyasn1-modules>=0.3.0,<0.4.0
cxxfilt>=0.3.0,<0.4.0
msgpack>=1.0.0,<1.1.0
pycparser>=2.20
pyqt5==5.15.7
Expand Down
4 changes: 2 additions & 2 deletions requirements_doc.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-r requirements_dev.txt
sphinx>=1.8.2,<2.0.0
sphinx-rtd-theme>=0.4.2,<1.0.0
sphinx>=7.1.0,<7.2.0
sphinx-rtd-theme>=1.2.0,<1.3.0
jinja2<3.1.0
60 changes: 0 additions & 60 deletions setup.py

This file was deleted.

Loading

0 comments on commit 6d760a1

Please sign in to comment.